diff --git a/.gitmodules b/.gitmodules index b6eef2bb..964e8db5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,9 +77,6 @@ [submodule "vim/.vim/bundle/vim-dirvish"] path = vim/.vim/bundle/vim-dirvish url = https://github.com/justinmk/vim-dirvish -[submodule "vim/.vim/bundle/tsuquyomi"] - path = vim/.vim/bundle/tsuquyomi - url = https://github.com/Quramy/tsuquyomi [submodule "vim/.vim/bundle/vim-polyglot"] path = vim/.vim/bundle/vim-polyglot url = https://github.com/sheerun/vim-polyglot @@ -119,3 +116,6 @@ [submodule "mutt/.mutt/bundle/mutt-colors-solarized"] path = mutt/.mutt/bundle/mutt-colors-solarized url = https://github.com/altercation/mutt-colors-solarized +[submodule "vim/.vim/bundle/tern_for_vim"] + path = vim/.vim/bundle/tern_for_vim + url = https://github.com/ternjs/tern_for_vim diff --git a/README.md b/README.md index 3d281ed9..37c450c4 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper Completion menu using FZF, tab-completion, support for `ripgrep` in FZF * [syntastic](https://github.com/scrooloose/syntastic): Syntax checking hacks for vim - * [tsuquyomi](https://github.com/Quramy/tsuquyomi): A Vim plugin for TypeScript + * [tern_for_vim](https://github.com/ternjs/tern_for_vim): Tern plugin for Vim * [ultisnips](https://github.com/SirVer/ultisnips): The ultimate snippet solution for Vim * [vaxe](https://github.com/jdonaldson/vaxe): A modern, modular vim mode for diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc index 251f9933..641f1d2f 100644 --- a/bspwm/.config/sxhkd/sxhkdrc +++ b/bspwm/.config/sxhkd/sxhkdrc @@ -37,6 +37,16 @@ super + Escape super + e slock +# +# mouse keys +# + +alt + {_,shift + } + {h,j,k,l} + xdotool mousemove_relative --sync {--,--} {-35 0,0 35,0 -35,35 0} + +ctrl + {_,shift + } + {u,o} + xdotool {click,click} {1,3} + # # bspwm hotkeys # diff --git a/tmux/.tmux/bundle/tmux-open b/tmux/.tmux/bundle/tmux-open index 6d268927..f344d38f 160000 --- a/tmux/.tmux/bundle/tmux-open +++ b/tmux/.tmux/bundle/tmux-open @@ -1 +1 @@ -Subproject commit 6d268927c20b9810f8ff53db5efaa4ed5d2a7247 +Subproject commit f344d38f20b5992d56bb6f272a7bdd5e48127927 diff --git a/vim/.vim/bundle/base16-vim b/vim/.vim/bundle/base16-vim index c1c3e6cc..2d991f14 160000 --- a/vim/.vim/bundle/base16-vim +++ b/vim/.vim/bundle/base16-vim @@ -1 +1 @@ -Subproject commit c1c3e6ccb1a4cd4ea00162abb4ccece4a3e69d0b +Subproject commit 2d991f14f688a38b7b2bcd397bad5efadd0f80a9 diff --git a/vim/.vim/bundle/codi.vim b/vim/.vim/bundle/codi.vim index cb78d872..e99248b7 160000 --- a/vim/.vim/bundle/codi.vim +++ b/vim/.vim/bundle/codi.vim @@ -1 +1 @@ -Subproject commit cb78d87230c6bd5706bfa55379cb8fa98a72b316 +Subproject commit e99248b72a5d47161a72df63e2a935f089c10eec diff --git a/vim/.vim/bundle/editorconfig-vim b/vim/.vim/bundle/editorconfig-vim index a069da84..14376e0e 160000 --- a/vim/.vim/bundle/editorconfig-vim +++ b/vim/.vim/bundle/editorconfig-vim @@ -1 +1 @@ -Subproject commit a069da8426ec5b9fc4d9f83c783c999e9d20f7d0 +Subproject commit 14376e0e7f8118af7297daa8d4f5f261ca4efacb diff --git a/vim/.vim/bundle/fzf.vim b/vim/.vim/bundle/fzf.vim index 685f9aae..39f0c2d0 160000 --- a/vim/.vim/bundle/fzf.vim +++ b/vim/.vim/bundle/fzf.vim @@ -1 +1 @@ -Subproject commit 685f9aae97072a190a1230a5c79692e15b7f46c9 +Subproject commit 39f0c2d0a40cae71280fa88edbdcc51bdcfbaec9 diff --git a/vim/.vim/bundle/syntastic b/vim/.vim/bundle/syntastic index e1161a72..1a8f372b 160000 --- a/vim/.vim/bundle/syntastic +++ b/vim/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit e1161a723a353db99780f9a9351340df7abbb106 +Subproject commit 1a8f372b3598d8ec639945e4593b6b6731ed24ac diff --git a/vim/.vim/bundle/tern_for_vim b/vim/.vim/bundle/tern_for_vim new file mode 160000 index 00000000..ae42c69a --- /dev/null +++ b/vim/.vim/bundle/tern_for_vim @@ -0,0 +1 @@ +Subproject commit ae42c69ada7243fe4801fce3b916bbc2f40ac4ac diff --git a/vim/.vim/bundle/tsuquyomi b/vim/.vim/bundle/tsuquyomi deleted file mode 160000 index 46dfcd72..00000000 --- a/vim/.vim/bundle/tsuquyomi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46dfcd72b9701a52331349ba0d5c7596167093ab diff --git a/vim/.vim/bundle/vaxe b/vim/.vim/bundle/vaxe index d5f905f8..e1c08dcb 160000 --- a/vim/.vim/bundle/vaxe +++ b/vim/.vim/bundle/vaxe @@ -1 +1 @@ -Subproject commit d5f905f806c7c90bb116d4b06a78924341840021 +Subproject commit e1c08dcb43c25a3d9bf1183772130a5bfdbe257e diff --git a/vim/.vim/bundle/vim-dirvish b/vim/.vim/bundle/vim-dirvish index d215bcba..5a2ea530 160000 --- a/vim/.vim/bundle/vim-dirvish +++ b/vim/.vim/bundle/vim-dirvish @@ -1 +1 @@ -Subproject commit d215bcba7c965d21420aaba44e3b34dad1b0d1eb +Subproject commit 5a2ea5308bbcd666b549f4c851b9fde443f12ce3 diff --git a/vim/.vim/bundle/vim-gutentags b/vim/.vim/bundle/vim-gutentags index c400613e..b948a814 160000 --- a/vim/.vim/bundle/vim-gutentags +++ b/vim/.vim/bundle/vim-gutentags @@ -1 +1 @@ -Subproject commit c400613e99abbd055ab156a44246288248091234 +Subproject commit b948a814e0b8e7887703f9d0f526608762a6ea42 diff --git a/vim/.vim/bundle/vim-javacomplete2 b/vim/.vim/bundle/vim-javacomplete2 index b1f364f8..8d0ed914 160000 --- a/vim/.vim/bundle/vim-javacomplete2 +++ b/vim/.vim/bundle/vim-javacomplete2 @@ -1 +1 @@ -Subproject commit b1f364f8bd435e2b6557d9075b83d6d3712ae9a8 +Subproject commit 8d0ed9148ffe535e1febbe0ef77b3e69d2b54b63 diff --git a/vim/.vim/bundle/vim-pathogen b/vim/.vim/bundle/vim-pathogen index ddfb1f14..e7857bed 160000 --- a/vim/.vim/bundle/vim-pathogen +++ b/vim/.vim/bundle/vim-pathogen @@ -1 +1 @@ -Subproject commit ddfb1f14d7597e6aedc749be06b559a673c437ab +Subproject commit e7857bed4e0705f91f781dbe99706f07d08d104b diff --git a/vim/.vim/bundle/vim-polyglot b/vim/.vim/bundle/vim-polyglot index 8eab5f54..9bfde757 160000 --- a/vim/.vim/bundle/vim-polyglot +++ b/vim/.vim/bundle/vim-polyglot @@ -1 +1 @@ -Subproject commit 8eab5f5403afc1c33a7593459a27f7ff625fa60b +Subproject commit 9bfde7574aa89a91b80ed9c993fc000cfc11aae7 diff --git a/vim/.vim/bundle/vim-snippets b/vim/.vim/bundle/vim-snippets index 0817950a..9de9bb39 160000 --- a/vim/.vim/bundle/vim-snippets +++ b/vim/.vim/bundle/vim-snippets @@ -1 +1 @@ -Subproject commit 0817950a4fb8ccd48ec38a2b65cf046b597eecb3 +Subproject commit 9de9bb39a2ae5264ce6c757cff4be89e65ee84fb diff --git a/vim/.vim/bundle/vim-test b/vim/.vim/bundle/vim-test index 27476e74..4eca1a0b 160000 --- a/vim/.vim/bundle/vim-test +++ b/vim/.vim/bundle/vim-test @@ -1 +1 @@ -Subproject commit 27476e741d6de826f21bd4f484e80c270f3dd0b7 +Subproject commit 4eca1a0b6d12109bd764ea447f7089ace96abd04 diff --git a/vim/.vim/ftplugin/javascript.vim b/vim/.vim/ftplugin/javascript.vim index 43dd6907..20de1fe0 100644 --- a/vim/.vim/ftplugin/javascript.vim +++ b/vim/.vim/ftplugin/javascript.vim @@ -1 +1,2 @@ setlocal omnifunc=javascriptcomplete#CompleteJS +let g:syntastic_javascript_checkers = ['standard'] diff --git a/vim/.vim/ftplugin/typescript.vim b/vim/.vim/ftplugin/typescript.vim deleted file mode 100644 index 86c44de3..00000000 --- a/vim/.vim/ftplugin/typescript.vim +++ /dev/null @@ -1,7 +0,0 @@ -" Completor integration -let g:completor_typescript_omni_trigger = '(\w+|[^\. \t0-9]+\.\w*)$' - -" Tsuquyomi and syntastic integration -let g:tsuquyomi_disable_quickfix = 1 -let g:syntastic_typescript_checkers = ['tslint', 'tsuquyomi'] -let g:syntastic_typescript_tslint_args= '--project tsconfig.json' diff --git a/zsh/.fzf b/zsh/.fzf index bc398318..b27dc3eb 160000 --- a/zsh/.fzf +++ b/zsh/.fzf @@ -1 +1 @@ -Subproject commit bc3983181d992c564e069791b5c6549bde9bfeb3 +Subproject commit b27dc3eb1745ed29146feca94652bba0f0dd21c2 diff --git a/zsh/.zim b/zsh/.zim index 460090be..96c47497 160000 --- a/zsh/.zim +++ b/zsh/.zim @@ -1 +1 @@ -Subproject commit 460090beb99e91b08f2a63dbd26ed1a2ced181f7 +Subproject commit 96c474978e8ff2b3b47154a627cbbf61325524e6 diff --git a/zsh/.zsh/bundle/base16-shell b/zsh/.zsh/bundle/base16-shell index 2251b7db..82ca06a3 160000 --- a/zsh/.zsh/bundle/base16-shell +++ b/zsh/.zsh/bundle/base16-shell @@ -1 +1 @@ -Subproject commit 2251b7db71b2a48602cc4d858c4ce326a5874bdd +Subproject commit 82ca06a36cef3c7d0f0e084a86d4a470608c2c37