From 44e323b526c00642f49709ad734ce7e6fdbe2c26 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 2 Apr 2020 12:28:13 -0400 Subject: auto push --- .old/install/install.sh | 63 ++++++++++++++++++++++++++++++ .old/install/utils/installer.sh | 86 +++++++++++++++++++++++++++++++++++++++++ README.md | 79 ++++++++++++++++++++++++++++++------- install/install.sh | 63 ------------------------------ install/utils/installer.sh | 86 ----------------------------------------- modules/vim-which-key.vim | 1 + 6 files changed, 214 insertions(+), 164 deletions(-) create mode 100755 .old/install/install.sh create mode 100644 .old/install/utils/installer.sh delete mode 100755 install/install.sh delete mode 100644 install/utils/installer.sh diff --git a/.old/install/install.sh b/.old/install/install.sh new file mode 100755 index 00000000..b3ba11b9 --- /dev/null +++ b/.old/install/install.sh @@ -0,0 +1,63 @@ +#!/bin/sh + +#if [ "$(uname)" == "Darwin" ]; then + #echo 'MacOS Detected' + #echo "installing miniconda" + #wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O ~/.config/nvim/install/miniconda.sh + #echo " Grabbing a font to use foe devicons " + #brew tap homebrew/cask-fonts + #brew cask install font-hack-nerd-font + #brew install ranger +#elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then + #echo 'Linux Detected' + #wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/.config/nvim/install/miniconda.sh + #mkdir -p ~/.local/share/fonts + #cd ~/.local/share/fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf +#fi + +#chmod +x ~/.config/nvim/install/miniconda.sh + +#sh ~/.config/nvim/install/miniconda.sh -b -f -p $HOME/.miniconda + +#echo '# Miniconda' >> ~/.zshrc +#echo 'export PATH="$HOME/.miniconda/bin:$PATH"' >> ~/.zshrc + +#. ~/.zshrc + +#conda create --name neovim python=3.8 --yes + +#. activate neovim + +#pip install neovim + +#. deactivate + +#conda create --name pyls python=3.7 --yes + +#. activate pyls + +#pip install 'python-language-server[all]' +#pip install vim-vint + +#. deactivate + +#pip install 'python-language-server[all]' + +#if [ ! -f ~/.bash_aliases ]; then +# echo ".bash_aliases not found!" +# touch ~/.bash_aliases +# echo 'source ~/.bash_aliases' >> ~/.bashrc +#fi + +#echo 'alias mkenv="conda create --clone pyls --name"' >> ~/.bash_aliases + +#echo 'let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.8")' > ~/.config/nvim/modules/pythonpath.vim + +if [ ! -d ~/.config/nvim/dein ]; then + echo "dein package manager not found" + sh ~/.config/nvim/install/utils/installer.sh ~/.config/nvim/dein +fi + +# Cleanup + +#rm ~/.config/nvim/install/miniconda.sh diff --git a/.old/install/utils/installer.sh b/.old/install/utils/installer.sh new file mode 100644 index 00000000..de8c093e --- /dev/null +++ b/.old/install/utils/installer.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# Standalone installer for Unixs +# Original version is created by shoma2da +# https://github.com/shoma2da/neobundle_installer + +if [ $# -ne 1 ]; then + echo "You must specify the installation directory!" + exit 1 +fi + +# Convert the installation directory to absolute path +case $1 in + /*) PLUGIN_DIR=$1;; + *) PLUGIN_DIR=$PWD/$1;; +esac +INSTALL_DIR="${PLUGIN_DIR}/repos/github.com/Shougo/dein.vim" +echo "Install to \"$INSTALL_DIR\"..." +if [ -e "$INSTALL_DIR" ]; then + echo "\"$INSTALL_DIR\" already exists!" +fi + +echo "" + +# check git command +type git || { + echo 'Please install git or update your path to include the git executable!' + exit 1 +} +echo "" + +# make plugin dir and fetch dein +if ! [ -e "$INSTALL_DIR" ]; then + echo "Begin fetching dein..." + mkdir -p "$PLUGIN_DIR" + git clone https://github.com/Shougo/dein.vim "$INSTALL_DIR" + echo "Done." + echo "" +fi + +# write initial setting for .vimrc +echo "Please add the following settings for dein to the top of your vimrc (Vim) or init.vim (NeoVim) file:" +{ + echo "" + echo "" + echo "\"dein Scripts-----------------------------" + echo "if &compatible" + echo " set nocompatible \" Be iMproved" + echo "endif" + echo "" + echo "\" Required:" + echo "set runtimepath+=$INSTALL_DIR" + echo "" + echo "\" Required:" + echo "if dein#load_state('$PLUGIN_DIR')" + echo " call dein#begin('$PLUGIN_DIR')" + echo "" + echo " \" Let dein manage dein" + echo " \" Required:" + echo " call dein#add('$INSTALL_DIR')" + echo "" + echo " \" Add or remove your plugins here like this:" + echo " \"call dein#add('Shougo/neosnippet.vim')" + echo " \"call dein#add('Shougo/neosnippet-snippets')" + echo "" + echo " \" Required:" + echo " call dein#end()" + echo " call dein#save_state()" + echo "endif" + echo "" + echo "\" Required:" + echo "filetype plugin indent on" + echo "syntax enable" + echo "" + echo "\" If you want to install not installed plugins on startup." + echo "\"if dein#check_install()" + echo "\" call dein#install()" + echo "\"endif" + echo "" + echo "\"End dein Scripts-------------------------" + echo "" + echo "" +} + +echo "Done." + +echo "Complete setup dein!" diff --git a/README.md b/README.md index 90032db5..f1294097 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,85 @@ # Nvim +Plugging my [blog](chrisatmachine.com) +Plugging my [YouTube channel](https://www.youtube.com/channel/UCS97tchJDq17Qms3cux8wcA) + ## Install -To install run the install script in the install folder +Dependencies: + +- neovim +- Node +- Python3 +- Ripgrep +- fzf +- ranger +- hack-nerd-font +- ranger +- universal-ctags + +### Install dependencies On MacOS ``` -./install + brew install node + brew install neovim + brew install ripgrep + brew install fzf + brew tap homebrew/cask-fonts + brew cask install font-hack-nerd-font + brew install ranger + brew install --HEAD universal-ctags/universal-ctags/universal-ctags ``` -## Post install +### Install dependencies on Linux -After install open Neovim and run the following: +I assume you can figure it out based on the requirements smart guy -``` -:UpdateRemotePlugins +### Setting Node path and Python3 path -:checkhealth +#### pythonpath + +Open `modules/pythonpath.vim` and point it to a version of python that has neovim installed + +example: + +``` +let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.8") ``` -Follow my development here +#### nodepath for Coc - +Open `modules/nodepath.vim` and point it to a version of python that has neovim installed +example: + +``` +let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node") ``` -conda create -n neovim python=3.7 +## Set up plugin manager + +``` +sh ~/.config/nvim/install/utils/installer.sh ~/.config/nvim/dein ``` -install ripgrep" for gutentags to ignore .gitignore +## Install nvim + +You should now run `nvim` and wait while the package manager installs your plugins + + +## Post install -install universal ctags" +After install open Neovim and run the following: -make sure you open the language server module and point to the correct binaries such as pyls and vint +``` +:UpdateRemotePlugins + +:checkhealth +``` + +## CoC Language support + +## ALE Linting ## TODO @@ -45,6 +93,7 @@ make sure you open the language server module and point to the correct binaries - Check out more coc extensions - https://github.com/voldikss/coc-todolist - VimWiki -- fix tmux messing up my colors -- figure out denite and give it a good shortcut +## Notes + +install ripgrep" for gutentags to ignore .gitignore diff --git a/install/install.sh b/install/install.sh deleted file mode 100755 index ba272c8d..00000000 --- a/install/install.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -if [ "$(uname)" == "Darwin" ]; then - echo 'MacOS Detected' - echo "installing miniconda" - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O ~/.config/nvim/install/miniconda.sh - echo " Grabbing a font to use foe devicons " - brew tap homebrew/cask-fonts - brew cask install font-hack-nerd-font - brew install ranger -elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then - echo 'Linux Detected' - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/.config/nvim/install/miniconda.sh - mkdir -p ~/.local/share/fonts - cd ~/.local/share/fonts && curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf -fi - -#chmod +x ~/.config/nvim/install/miniconda.sh - -sh ~/.config/nvim/install/miniconda.sh -b -f -p $HOME/.miniconda - -echo '# Miniconda' >> ~/.zshrc -echo 'export PATH="$HOME/.miniconda/bin:$PATH"' >> ~/.zshrc - -. ~/.zshrc - -conda create --name neovim python=3.8 --yes - -. activate neovim - -pip install neovim - -. deactivate - -#conda create --name pyls python=3.7 --yes - -#. activate pyls - -#pip install 'python-language-server[all]' -#pip install vim-vint - -#. deactivate - -#pip install 'python-language-server[all]' - -#if [ ! -f ~/.bash_aliases ]; then -# echo ".bash_aliases not found!" -# touch ~/.bash_aliases -# echo 'source ~/.bash_aliases' >> ~/.bashrc -#fi - -#echo 'alias mkenv="conda create --clone pyls --name"' >> ~/.bash_aliases - -echo 'let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.8")' > ~/.config/nvim/modules/pythonpath.vim - -if [ ! -d ~/.config/nvim/dein ]; then - echo "dein package manager not found" - sh ~/.config/nvim/install/utils/installer.sh ~/.config/nvim/dein -fi - -# Cleanup - -rm ~/.config/nvim/install/miniconda.sh diff --git a/install/utils/installer.sh b/install/utils/installer.sh deleted file mode 100644 index de8c093e..00000000 --- a/install/utils/installer.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# Standalone installer for Unixs -# Original version is created by shoma2da -# https://github.com/shoma2da/neobundle_installer - -if [ $# -ne 1 ]; then - echo "You must specify the installation directory!" - exit 1 -fi - -# Convert the installation directory to absolute path -case $1 in - /*) PLUGIN_DIR=$1;; - *) PLUGIN_DIR=$PWD/$1;; -esac -INSTALL_DIR="${PLUGIN_DIR}/repos/github.com/Shougo/dein.vim" -echo "Install to \"$INSTALL_DIR\"..." -if [ -e "$INSTALL_DIR" ]; then - echo "\"$INSTALL_DIR\" already exists!" -fi - -echo "" - -# check git command -type git || { - echo 'Please install git or update your path to include the git executable!' - exit 1 -} -echo "" - -# make plugin dir and fetch dein -if ! [ -e "$INSTALL_DIR" ]; then - echo "Begin fetching dein..." - mkdir -p "$PLUGIN_DIR" - git clone https://github.com/Shougo/dein.vim "$INSTALL_DIR" - echo "Done." - echo "" -fi - -# write initial setting for .vimrc -echo "Please add the following settings for dein to the top of your vimrc (Vim) or init.vim (NeoVim) file:" -{ - echo "" - echo "" - echo "\"dein Scripts-----------------------------" - echo "if &compatible" - echo " set nocompatible \" Be iMproved" - echo "endif" - echo "" - echo "\" Required:" - echo "set runtimepath+=$INSTALL_DIR" - echo "" - echo "\" Required:" - echo "if dein#load_state('$PLUGIN_DIR')" - echo " call dein#begin('$PLUGIN_DIR')" - echo "" - echo " \" Let dein manage dein" - echo " \" Required:" - echo " call dein#add('$INSTALL_DIR')" - echo "" - echo " \" Add or remove your plugins here like this:" - echo " \"call dein#add('Shougo/neosnippet.vim')" - echo " \"call dein#add('Shougo/neosnippet-snippets')" - echo "" - echo " \" Required:" - echo " call dein#end()" - echo " call dein#save_state()" - echo "endif" - echo "" - echo "\" Required:" - echo "filetype plugin indent on" - echo "syntax enable" - echo "" - echo "\" If you want to install not installed plugins on startup." - echo "\"if dein#check_install()" - echo "\" call dein#install()" - echo "\"endif" - echo "" - echo "\"End dein Scripts-------------------------" - echo "" - echo "" -} - -echo "Done." - -echo "Complete setup dein!" diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim index 32fd033f..7388e02b 100644 --- a/modules/vim-which-key.vim +++ b/modules/vim-which-key.vim @@ -46,6 +46,7 @@ let g:which_key_map.t = { \ 'r' : [':set norelativenumber!' , 'rel-line-numbers'] , \ 's' : [':let @/ = ""' , 'remove-search-highlight'] , \ 'c' : ['ColorToggle' , 'remove-color'] , + \ 't' : [':6sp term://zsh' , 'terminal'] , \ } let g:which_key_map.h = { -- cgit v1.2.3