diff options
-rw-r--r-- | nvim/.config/nvim/coc-settings.json | 22 | ||||
-rw-r--r-- | nvim/.config/nvim/ftplugin/haskell.vim | 2 | ||||
-rw-r--r-- | nvim/.config/nvim/ftplugin/tex.vim | 3 | ||||
-rw-r--r-- | nvim/.config/nvim/init.vim | 7 |
4 files changed, 8 insertions, 26 deletions
diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json index c5a12f1..e63d356 100644 --- a/nvim/.config/nvim/coc-settings.json +++ b/nvim/.config/nvim/coc-settings.json | |||
@@ -36,28 +36,6 @@ | |||
36 | "cformatpath": "/bin/clang-format" | 36 | "cformatpath": "/bin/clang-format" |
37 | } | 37 | } |
38 | }, | 38 | }, |
39 | "haskell": { | ||
40 | "command": "haskell-language-server-wrapper", | ||
41 | "args": ["--lsp"], | ||
42 | "rootPatterns": [ | ||
43 | "*.cabal", | ||
44 | "stack.yaml", | ||
45 | "cabal.project", | ||
46 | "cabal.project.local", | ||
47 | "package.yaml", | ||
48 | "hie.yaml" | ||
49 | ], | ||
50 | "filetypes": [ | ||
51 | "hs", | ||
52 | "lhs", | ||
53 | "haskell" | ||
54 | ], | ||
55 | "initializationOptions": { | ||
56 | "languageServerHaskell": { | ||
57 | "hlintOn": true | ||
58 | } | ||
59 | } | ||
60 | }, | ||
61 | "lua": { | 39 | "lua": { |
62 | "command": "lua-lsp", | 40 | "command": "lua-lsp", |
63 | "filetypes": ["lua"] | 41 | "filetypes": ["lua"] |
diff --git a/nvim/.config/nvim/ftplugin/haskell.vim b/nvim/.config/nvim/ftplugin/haskell.vim index 5bcdd4c..651f033 100644 --- a/nvim/.config/nvim/ftplugin/haskell.vim +++ b/nvim/.config/nvim/ftplugin/haskell.vim | |||
@@ -25,6 +25,6 @@ set makeprg=hlint | |||
25 | 25 | ||
26 | augroup HaskellLint | 26 | augroup HaskellLint |
27 | autocmd! | 27 | autocmd! |
28 | autocmd BufWritePost *.hs | silent make! <afile> | silent redraw! | 28 | autocmd BufWritePost *.hs | call s:RunStylishHaskell() | silent make! <afile> | silent redraw! |
29 | autocmd QuickFixCmdPost [^l]* cwindow | 29 | autocmd QuickFixCmdPost [^l]* cwindow |
30 | augroup END | 30 | augroup END |
diff --git a/nvim/.config/nvim/ftplugin/tex.vim b/nvim/.config/nvim/ftplugin/tex.vim index 2b63637..515fb7a 100644 --- a/nvim/.config/nvim/ftplugin/tex.vim +++ b/nvim/.config/nvim/ftplugin/tex.vim | |||
@@ -1,3 +1,6 @@ | |||
1 | setlocal wrap | 1 | setlocal wrap |
2 | setlocal number | ||
2 | nnoremap j gj | 3 | nnoremap j gj |
3 | nnoremap k gk | 4 | nnoremap k gk |
5 | let g:tex_conceal="abdmgs" | ||
6 | let g:tex_fold_enabled=1 | ||
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index ebe7ad2..c037da0 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim | |||
@@ -106,6 +106,7 @@ set updatetime=300 | |||
106 | set signcolumn=yes | 106 | set signcolumn=yes |
107 | set inccommand=split | 107 | set inccommand=split |
108 | set showmatch | 108 | set showmatch |
109 | set diffopt+=vertical | ||
109 | 110 | ||
110 | let g:netrw_browsex_viewer= "xdg-open" | 111 | let g:netrw_browsex_viewer= "xdg-open" |
111 | 112 | ||
@@ -161,9 +162,9 @@ let g:rustfmt_autosave = 1 | |||
161 | 162 | ||
162 | " fzf colors | 163 | " fzf colors |
163 | let g:fzf_colors = | 164 | let g:fzf_colors = |
164 | \ { 'fg': ['fg', 'Normal'], | 165 | \ { 'fg': ['fg', 'Noise'], |
165 | \ 'bg': ['bg', 'Normal'], | 166 | \ 'bg': ['bg', 'Noise'], |
166 | \ 'hl': ['fg', 'Comment'], | 167 | \ 'hl': ['fg', 'Statement'], |
167 | \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], | 168 | \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], |
168 | \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], | 169 | \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], |
169 | \ 'hl+': ['fg', 'Statement'], | 170 | \ 'hl+': ['fg', 'Statement'], |