Browse Source

udpate docker install

Chris 5 years ago
parent
commit
88f156841b
4 changed files with 164 additions and 3 deletions
  1. 1 1
      keys/which-key.vim
  2. 1 1
      nvim-mach2.Dockerfile
  3. 161 0
      utils/install-docker.sh
  4. 1 1
      utils/install.sh

+ 1 - 1
keys/which-key.vim

@@ -164,7 +164,7 @@ let g:which_key_map.l = {
       \ 'Z' : [':CocEnable'                          , 'enable CoC'],
       \ }
 
-" t is for toggle
+" t is for terminal
 let g:which_key_map.t = {
       \ 'name' : '+terminal' ,
       \ ';' : [':FloatermNew --wintype=popup --height=6'        , 'terminal'],

+ 1 - 1
nvim-mach2.Dockerfile

@@ -25,7 +25,7 @@ RUN apt update && apt install -y \
 SHELL ["/bin/bash", "-c"]
 
 RUN npm i -g neovim
-RUN bash  <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/nvim/master/utils/install.sh)
+RUN bash  <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/nvim/master/utils/install-docker.sh)
 RUN git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf && ~/.fzf/install
 
 CMD ["nvim"]

+ 161 - 0
utils/install-docker.sh

@@ -0,0 +1,161 @@
+#!/bin/bash
+
+set -o nounset    # error when referencing undefined variable
+set -o errexit    # exit when command fails
+
+installnodemac() { \
+  brew install node
+}
+
+installnodeubuntu() { \
+  sudo apt install nodejs
+  sudo apt install npm
+}
+
+installnodearch() { \
+  sudo pacman -S nodejs
+  sudo pacman -S npm
+}
+
+installnode() { \
+  echo "Installing node..."
+  [ "$(uname)" == "Darwin" ] && installnodemac
+  [  -n "$(uname -a | grep Ubuntu)" ] && installnodeubuntu
+  [ -f "/etc/arch-release" ] && installnodearch
+  [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ] && echo "Windows not currently supported"
+  sudo npm i -g neovim
+}
+
+installpiponmac() { \
+  sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+  python3 get-pip.py
+  rm get-pip.py
+}
+
+installpiponubuntu() { \
+  sudo apt install python3-pip > /dev/null
+}
+
+installpiponarch() { \
+  pacman -S python-pip
+}
+
+installpip() { \
+  echo "Installing pip..."
+  [ "$(uname)" == "Darwin" ] && installpiponmac
+  [  -n "$(uname -a | grep Ubuntu)" ] && installpiponubuntu
+  [ -f "/etc/arch-release" ] && installpiponarch
+  [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ] && echo "Windows not currently supported"
+}
+
+installpynvim() { \
+  echo "Installing pynvim..."
+  pip3 install pynvim
+}
+
+installcocextensions() { \
+  # Install extensions
+  mkdir -p ~/.config/coc/extensions
+  cd ~/.config/coc/extensions
+  [ ! -f package.json ] && echo '{"dependencies":{}}'> package.json
+  # Change extension names to the extensions you need
+  # sudo npm install coc-explorer coc-snippets coc-json coc-actions --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod
+  npm install coc-explorer coc-snippets coc-json coc-actions --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod
+}
+
+cloneconfig() { \
+  echo "Cloning Nvim Mach 2 configuration"
+  git clone https://github.com/ChristianChiarulli/nvim.git ~/.config/nvim
+}
+
+moveoldnvim() { \
+  echo "Moving your config to nvim.old"
+  mv $HOME/.config/nvim $HOME/.config/nvim.old
+}
+
+installplugins() { \
+  mv $HOME/.config/nvim/init.vim $HOME/.config/nvim/init.vim.tmp
+  mv $HOME/.config/nvim/utils/init.vim $HOME/.config/nvim/init.vim
+  echo "Installing plugins..."
+  nvim --headless +PlugInstall +qall > /dev/null 2>&1
+  mv $HOME/.config/nvim/init.vim $HOME/.config/nvim/utils/init.vim
+  mv $HOME/.config/nvim/init.vim.tmp $HOME/.config/nvim/init.vim
+}
+
+asktoinstallnode() { \
+  echo "node not found"
+  echo -n "Would you like to install node now (y/n)? "
+  read answer
+  [ "$answer" != "${answer#[Yy]}" ] && installnode && installcocextensions
+}
+
+asktoinstallpip() { \
+  # echo "pip not found"
+  # echo -n "Would you like to install pip now (y/n)? "
+  # read answer
+  # [ "$answer" != "${answer#[Yy]}" ] && installpip
+  echo "Please install pip3 before continuing with install"
+  exit
+}
+
+installonmac() { \
+  brew install ripgrep fzf ranger
+}
+
+pipinstallueberzug() { \
+  which pip3 > /dev/null && pip3 install ueberzug || echo "Not installing ueberzug pip not found"
+}
+
+installonubuntu() { \
+  sudo apt install ripgrep fzf ranger  
+  sudo apt install libjpeg8-dev zlib1g-dev python-dev python3-dev libxtst-dev
+  pip3 install ueberzug
+  pip3 install neovim-remote
+}
+
+
+installonarch() { \
+  sudo pacman -S install ripgrep fzf ranger
+  which yay > /dev/null && yay -S python-ueberzug-git || pipinstallueberzug
+  pip3 install neovim-remote
+}
+
+installextrapackages() { \
+  [ "$(uname)" == "Darwin" ] && installonmac
+  [  -n "$(uname -a | grep Ubuntu)" ] && installonubuntu
+  [ -f "/etc/arch-release" ] && installonarch
+  [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ] && echo "Windows not currently supported"
+}
+
+# Welcome
+echo 'Installing Nvim Mach 2'
+
+# install pip
+which pip3 > /dev/null && echo "pip installed, moving on..." || asktoinstallpip
+
+# install node and neovim support
+which node > /dev/null && echo "node installed, moving on..." || asktoinstallnode
+
+
+# install pynvim
+pip3 list | grep pynvim > /dev/null && echo "pynvim installed, moving on..." || installpynvim
+
+# move old nvim directory if it exists
+[ -d "$HOME/.config/nvim" ] && moveoldnvim 
+
+# clone config down
+cloneconfig
+
+# echo "Nvim Mach 2 is better with at least ripgrep, ueberzug and ranger"
+# echo -n "Would you like to install these now?  (y/n)? "
+# read answer
+# [ "$answer" != "${answer#[Yy]}" ] && installextrapackages || echo "not installing extra packages"
+
+# install plugins
+which nvim > /dev/null && installplugins
+
+installcocextensions
+
+echo "I recommend you also install and activate a font from here: https://github.com/ryanoasis/nerd-fonts"
+
+echo "I also recommend you add 'set preview_images_method ueberzug' to ~/.config/ranger/rc.conf"

+ 1 - 1
utils/install.sh

@@ -60,7 +60,7 @@ installcocextensions() { \
   [ ! -f package.json ] && echo '{"dependencies":{}}'> package.json
   # Change extension names to the extensions you need
   # sudo npm install coc-explorer coc-snippets coc-json coc-actions --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod
-  npm install coc-explorer coc-snippets coc-json coc-actions --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod
+  sudo npm install coc-explorer coc-snippets coc-json coc-actions --global-style --ignore-scripts --no-bin-links --no-package-lock --only=prod
 }
 
 cloneconfig() { \