summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Xresources_openbsd_x15
-rw-r--r--fish/functions/t.fish3
-rw-r--r--vim/plugin/lsp.vim45
-rw-r--r--vim/vimrc3
4 files changed, 8 insertions, 48 deletions
diff --git a/Xresources_openbsd_x1 b/Xresources_openbsd_x1
index 1fe9287..62e7dcb 100644
--- a/Xresources_openbsd_x1
+++ b/Xresources_openbsd_x1
@@ -15,8 +15,9 @@ Xft.rgba : rgb
!xterm*faceName: xft:monospace:pixelsize=15
!xterm*faceName : DejaVu Sans mono:size=10
!xterm*faceName : Hack-Regular:size=8
-!xterm*faceName : Terminus:size=10
-xterm*faceName : JetBrainsMono:size=9
+xterm*faceName : Terminus:size=10
+!xterm*faceName : JetBrainsMono:size=9
+!xterm*faceName : Monocraft:size=10
XTerm*backarrowKey : false
XTerm.vt100.backarrowKey: false
XTerm.ttyModes : erase ^?
diff --git a/fish/functions/t.fish b/fish/functions/t.fish
new file mode 100644
index 0000000..05d3d6c
--- /dev/null
+++ b/fish/functions/t.fish
@@ -0,0 +1,3 @@
+function t --wraps=task --description 'alias t=task'
+ task $argv;
+end
diff --git a/vim/plugin/lsp.vim b/vim/plugin/lsp.vim
deleted file mode 100644
index ea2f62d..0000000
--- a/vim/plugin/lsp.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-func! s:setup_ls(...) abort
- let l:servers = lsp#get_allowed_servers()
-
- " key mappings
- for l:server in l:servers
- let l:cap = lsp#get_server_capabilities(l:server)
-
- if has_key(l:cap, 'completionProvider')
- setlocal completefunc=lsp#complete
- endif
-
- if has_key(l:cap, 'hoverProvider')
- setlocal keywordprg=:LspHover
- endif
-
- if has_key(l:cap, 'codeActionProvider')
- nmap <silent><buffer>ga <plug>(lsp-code-action)
- endif
-
- if has_key(l:cap, 'definitionProvider')
- nmap <silent><buffer>gd <plug>(lsp-definition)
- nmap <silent><buffer>gk <plug>(lsp-peek-definition)
- endif
- endfor
-endfunc
-
-" register language server
-augroup LSC
- autocmd!
- autocmd User lsp_setup call lsp#register_server({
- \ 'name': 'gopls',
- \ 'cmd': {_->['gopls']},
- \ 'allowlist': ['go']
- \})
-
- autocmd User lsp_server_init call <SID>setup_ls()
- autocmd BufEnter * call <SID>setup_ls()
-augroup END
-
-" disable diagnostics etc.
-let g:lsp_diagnostics_enabled = 0
-let g:lsp_diagnostics_signs_enabled = 0
-let g:lsp_diagnostics_virtual_text_enabled = 0
-let g:lsp_diagnostics_highlights_enabled = 0
-let g:lsp_document_code_action_signs_enabled = 0
diff --git a/vim/vimrc b/vim/vimrc
index 6d9d564..ce3db25 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -143,11 +143,12 @@ autocmd BufLeave * call s:copy_filename_as_mdlink()
" vim-plug
call plug#begin('~/.vim/plugged')
Plug 'morhetz/gruvbox'
-Plug 'prabirshrestha/vim-lsp'
+"Plug 'prabirshrestha/vim-lsp'
Plug 'alok/notational-fzf-vim'
Plug 'sheerun/vim-polyglot'
"Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'tpope/vim-commentary'
+Plug 'godlygeek/tabular'
Plug 'davidhalter/jedi'
Plug 'tpope/vim-dispatch'
Plug 'tpope/vim-fugitive'