summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.old/install/install.sh63
-rw-r--r--.old/install/utils/installer.sh (renamed from install/utils/installer.sh)0
-rw-r--r--README.md79
-rwxr-xr-xinstall/install.sh63
-rw-r--r--modules/vim-which-key.vim1
5 files changed, 128 insertions, 78 deletions
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/install/utils/installer.sh b/.old/install/utils/installer.sh
index de8c093e..de8c093e 100644
--- a/install/utils/installer.sh
+++ b/.old/install/utils/installer.sh
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
-<https://chiarulli.me>
+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/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 = {