diff options
-rw-r--r-- | stow/nvim/.config/nvim/ftplugin/typescript/typescript.vim | 17 | ||||
-rw-r--r-- | stow/nvim/.config/nvim/init.vim | 3 | ||||
-rw-r--r-- | stow/sxhkd/.config/sxhkd/sxhkdrc | 2 | ||||
-rw-r--r-- | stow/tmux/.tmux.conf | 3 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/tex/tex.vim | 2 | ||||
-rw-r--r-- | stow/vim/.vim/ftplugin/typescript/typescript.vim | 12 |
6 files changed, 27 insertions, 12 deletions
diff --git a/stow/nvim/.config/nvim/ftplugin/typescript/typescript.vim b/stow/nvim/.config/nvim/ftplugin/typescript/typescript.vim new file mode 100644 index 0000000..9e56582 --- /dev/null +++ b/stow/nvim/.config/nvim/ftplugin/typescript/typescript.vim @@ -0,0 +1,17 @@ +let mapleader = " " + +nnoremap <buffer> K :lua vim.lsp.buf.hover()<CR> +nnoremap <buffer><silent> gd :lua vim.lsp.buf.definition()<CR> +nnoremap <buffer> gr :lua vim.lsp.buf.references()<CR> +nnoremap <buffer> gR :lua vim.lsp.buf.rename()<CR> +nnoremap <buffer> <leader>e :lua vim.diagnostic.open_float()<CR> +nnoremap <buffer> <leader>E :lua vim.diagnostic.setloclist()<CR> +nnoremap <buffer> [e :lua vim.diagnostic.goto_prev({float=false})<CR> +nnoremap <buffer> ]e :lua vim.diagnostic.goto_next({float=false})<CR> +nnoremap <buffer> <leader>a :lua vim.lsp.buf.code_action()<CR> +nnoremap <buffer> <leader>ds :lua vim.lsp.buf.document_symbol()<CR> + +let mapleader = "," + +setlocal omnifunc=v:lua.vim.lsp.omnifunc +setlocal formatexpr=v:lua.vim.lsp.formatexpr() diff --git a/stow/nvim/.config/nvim/init.vim b/stow/nvim/.config/nvim/init.vim index f5360b1..1cdeb2c 100644 --- a/stow/nvim/.config/nvim/init.vim +++ b/stow/nvim/.config/nvim/init.vim @@ -16,6 +16,8 @@ lua vim.diagnostic.config({ lua require('lspconfig').bashls.setup{} +lua require('lspconfig').tsserver.setup{} + lua require('lspconfig').texlab.setup{} lua require('lspconfig').pylsp.setup{ @@ -29,3 +31,4 @@ lua require('lspconfig').pylsp.setup{ \} \} \} + diff --git a/stow/sxhkd/.config/sxhkd/sxhkdrc b/stow/sxhkd/.config/sxhkd/sxhkdrc index 9c8a9af..fec1f9b 100644 --- a/stow/sxhkd/.config/sxhkd/sxhkdrc +++ b/stow/sxhkd/.config/sxhkd/sxhkdrc @@ -101,7 +101,7 @@ super + shift + c super + d dmenuDic.sh -super + t +super + alt + t dmenutranslate # Emoji keyboard diff --git a/stow/tmux/.tmux.conf b/stow/tmux/.tmux.conf index 1e739b0..3b855b8 100644 --- a/stow/tmux/.tmux.conf +++ b/stow/tmux/.tmux.conf @@ -63,6 +63,9 @@ bind -r m-J resize-pane -D 10 bind -r m-K resize-pane -U 10 bind -r m-L resize-pane -R 10 +# Swap with marked pane +bind S swap-pane + # clipboard stuff bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xsel -bi' bind P run 'xsel -bo | tmux load-buffer - ; tmux paste-buffer' diff --git a/stow/vim/.vim/ftplugin/tex/tex.vim b/stow/vim/.vim/ftplugin/tex/tex.vim index f84f73e..c57bbc5 100644 --- a/stow/vim/.vim/ftplugin/tex/tex.vim +++ b/stow/vim/.vim/ftplugin/tex/tex.vim @@ -7,7 +7,7 @@ call matchadd('ColorColumn', '\%91v', 100) setlocal textwidth=80 setlocal omnifunc=v:lua.vim.lsp.omnifunc -setlocal formatexpr=v:lua.vim.lsp.formatexpr() +" setlocal formatexpr=v:lua.vim.lsp.formatexpr() let mapleader = " " diff --git a/stow/vim/.vim/ftplugin/typescript/typescript.vim b/stow/vim/.vim/ftplugin/typescript/typescript.vim index 40fe518..65e3c1a 100644 --- a/stow/vim/.vim/ftplugin/typescript/typescript.vim +++ b/stow/vim/.vim/ftplugin/typescript/typescript.vim @@ -19,16 +19,8 @@ let mapleader = " " nnoremap <buffer> <leader>C :sp ~/.vim/ftplugin/typescript/typescript.vim<CR> -nnoremap <buffer> <leader>s :!tmux new-window -b -t 9 -n 'npm start' 'tmux set -w remain-on-exit on; npm start'<CR><CR> -nnoremap <buffer> <leader>S :!tmux new-window -db -t 9 -n 'npm start' npm start<CR><CR> - -nnoremap <buffer> gd :YcmCompleter GoTo<CR> -nnoremap <buffer> gr :YcmCompleter GoToReferences<CR> -nnoremap <buffer> gh :YcmCompleter GetType<CR> -nnoremap <buffer> gD :YcmCompleter GetDoc<CR> -nnoremap <buffer> gR :YcmCompleter RefactorRename<Space> -nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR> -nnoremap <buffer> <leader>e :YcmDiags<CR> +nnoremap <buffer> <leader>s :!tmux new-window -db -t 9 -n 'npm start' npm start<CR><CR> +nnoremap <buffer> <leader>S :!tmux new-window -b -t 9 -n 'npm start' 'tmux set -w remain-on-exit on; npm start'<CR><CR> let mapleader = "," |