mirror of
https://github.com/tomru/DotfilesOld.git
synced 2026-03-03 06:27:21 +01:00
Merge remote-tracking branch 'origin/master' into everard
Conflicts: zshenv
This commit is contained in:
2
vimrc
2
vimrc
@@ -41,7 +41,7 @@ Plugin 'vim-airline', {'name': 'airline'}
|
||||
Plugin 'chriskempson/base16-vim'
|
||||
|
||||
Plugin 'scrooloose/syntastic.git'
|
||||
Plugin 'Townk/vim-autoclose'
|
||||
Plugin 'Raimondi/delimitMate'
|
||||
|
||||
Plugin 'pangloss/vim-javascript'
|
||||
Plugin 'mustache/vim-mustache-handlebars'
|
||||
|
||||
8
zshenv
8
zshenv
@@ -20,6 +20,14 @@ BASE16_SCHEME="solarized"
|
||||
BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
|
||||
[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
|
||||
|
||||
DIST=$(lsb_release -si)
|
||||
case $DIST in
|
||||
Arch )
|
||||
# use python 2.7 by default
|
||||
export PYTHON=python2
|
||||
;;
|
||||
esac
|
||||
|
||||
# BW specific stuff
|
||||
JIRA_URL="https://jira.brandwatch.com"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user