diff --git a/assets/default/fish/custom/alias.load b/assets/default/fish/custom/alias.load index e489639..ecb086f 100644 --- a/assets/default/fish/custom/alias.load +++ b/assets/default/fish/custom/alias.load @@ -18,7 +18,6 @@ balias cd..='cd ..' # vim balias mviml='env VIM_COLOR=github mvim' -balias gvim='mvim' # yelp balias moshdev='mosh dev7-devc' diff --git a/recipes/default/neovim b/recipes/default/neovim index a7f9c5e..926e48a 100644 --- a/recipes/default/neovim +++ b/recipes/default/neovim @@ -12,9 +12,16 @@ case "$PACKAGE_MANAGER" in ;; "apt-get") sudo_package 'libtool libtool-bin autoconf automake cmake g++ pkg-config unzip ninja-build' + # Ensure python support is in nvim + sudo_package 'python-dev python-pip python3-dev python3-pip' ;; esac +sudo pip install neovim +if command_exist pip3 ; then + sudo pip3 install neovim +fi + neovim_dir=$WORKSPACE/neovim if [ ! -d $neovim_dir ]; then diff --git a/recipes/default/packages b/recipes/default/packages index e4d325a..a648f01 100644 --- a/recipes/default/packages +++ b/recipes/default/packages @@ -1,7 +1,7 @@ #! /bin/bash sudo_package_update -sudo_package 'screen htop curl wget mercurial ctags tig pv' +sudo_package 'screen tmux htop curl wget mercurial ctags tig pv jq' # Manager specific packages case "$PACKAGE_MANAGER" in @@ -13,13 +13,13 @@ case "$PACKAGE_MANAGER" in ;; "brew") package 'vim' - sudo_package 'the_silver_searcher' + package 'the_silver_searcher' ;; "apt-get") if [ -n "$(apt-cache policy silversearcher-ag)" ] ; then sudo_package 'silversearcher-ag' fi - sudo_package 'build-essential bash-completion tmux vim' + sudo_package 'build-essential bash-completion vim' ;; esac @@ -27,3 +27,5 @@ esac # TODO: Install RVM and other ruby requirements and get ruby 1.9.2 sudo gem install rake +# install python packages +sudo pip install ipython flake8