summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris <[email protected]>2020-04-28 13:13:46 -0400
committerChris <[email protected]>2020-04-28 13:13:46 -0400
commitd45de4d2ecfaf96d056d0b8bef19007c6d26d310 (patch)
tree22f147cbd4e3370f941d2d22a24d1cf13cbae46b
parent1fd9fb4c4898d8d765e8cfd34b4e907a42d7cf22 (diff)
added a bunch of new stuff
-rw-r--r--README.md3
-rw-r--r--init.vim5
-rw-r--r--plug-config/easymotion.vim16
-rw-r--r--vim-plug/plugins.vim22
4 files changed, 39 insertions, 7 deletions
diff --git a/README.md b/README.md
index a6b63cd5..d5b0391c 100644
--- a/README.md
+++ b/README.md
@@ -84,10 +84,7 @@ Explainations and installation instrucion can be found on my blog
- People asked about vimwiki I kinda hate it but maybe I'll add it
- try this out https://github.com/asvetliakov/vim-easymotion
- update startify
-- goyo zen mode
- float term lazy git
-- vim-repeat
- spectre, or async task/run
- setup custom paths
- install script envsubst is your friend
-- vim radical sounds cool
diff --git a/init.vim b/init.vim
index 0d4250f7..22af038c 100644
--- a/init.vim
+++ b/init.vim
@@ -10,7 +10,8 @@ source $HOME/.config/nvim/vim-plug/plugins.vim
source $HOME/.config/nvim/general/settings.vim
source $HOME/.config/nvim/keys/mappings.vim
source $HOME/.config/nvim/general/paths.vim
-source $HOME/.config/nvim/plug-config/sneak.vim
+source $HOME/.config/nvim/plug-config/easymotion.vim
+source $HOME/.config/nvim/plug-config/quickscope.vim
" Source depending on if VSCode is our client
if exists('g:vscode')
@@ -21,10 +22,10 @@ else
source $HOME/.config/nvim/themes/syntax.vim
source $HOME/.config/nvim/themes/onedark.vim
source $HOME/.config/nvim/themes/airline.vim
- source $HOME/.config/nvim/plug-config/coc.vim
source $HOME/.config/nvim/plug-config/rnvimr.vim
source $HOME/.config/nvim/plug-config/fzf.vim
source $HOME/.config/nvim/plug-config/commentary.vim
source $HOME/.config/nvim/plug-config/rainbow.vim
lua require'plug-colorizer'
+ source $HOME/.config/nvim/plug-config/coc.vim
endif
diff --git a/plug-config/easymotion.vim b/plug-config/easymotion.vim
new file mode 100644
index 00000000..58f1ed72
--- /dev/null
+++ b/plug-config/easymotion.vim
@@ -0,0 +1,16 @@
+let g:EasyMotion_do_mapping = 0 " Disable default mappings
+
+" Jump to anywhere you want with minimal keystrokes, with just one key binding.
+" `s{char}{label}`
+nmap s <Plug>(easymotion-overwin-f)
+" or
+" `s{char}{char}{label}`
+" Need one more keystroke, but on average, it may be more comfortable.
+nmap s <Plug>(easymotion-overwin-f2)
+
+" Turn on case-insensitive feature
+let g:EasyMotion_smartcase = 1
+
+" JK motions: Line motions
+map <Leader>j <Plug>(easymotion-j)
+map <Leader>k <Plug>(easymotion-k)
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index bdde39d4..6dca4b36 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -9,10 +9,11 @@ endif
call plug#begin('~/.config/nvim/autoload/plugged')
" Text Navigation
- Plug 'justinmk/vim-sneak'
+ " Plug 'justinmk/vim-sneak'
Plug 'unblevable/quick-scope'
" Change dates fast
Plug 'tpope/vim-speeddating'
+ Plug 'asvetliakov/vim-easymotion'
if !exists('g:vscode')
" Better Syntax Support
@@ -40,6 +41,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'junegunn/rainbow_parentheses.vim'
" Git
Plug 'airblade/vim-gitgutter'
+ Plug 'tpope/vim-fugitive'
+ Plug 'junegunn/gv.vim'
" Terminal
Plug 'voldikss/vim-floaterm'
" Start Screen
@@ -48,7 +51,22 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'tpope/vim-surround'
" Vista
Plug 'liuchengxu/vista.vim'
- "
+ " Files
+ Plug 'tpope/vim-eunuch'
+ " Help
+ Plug 'liuchengxu/vim-which-key'
+ " Zen mode
+ Plug 'junegunn/goyo.vim'
+ " Repeat stuff
+ Plug 'tpope/vim-repeat'
+ " Convert binary, hex, etc..
+ Plug 'glts/vim-radical'
+ " Making stuff
+ Plug 'neomake/neomake'
+ " Snippets TODO fix TAB hijack
+ " Plug 'SirVer/ultisnips'
+ " Better Comments
+ Plug 'jbgutierrez/vim-better-comments'
endif