aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nvim/.config/nvim/coc-settings.json22
-rw-r--r--nvim/.config/nvim/ftplugin/haskell.vim2
-rw-r--r--nvim/.config/nvim/ftplugin/tex.vim3
-rw-r--r--nvim/.config/nvim/init.vim7
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
26augroup HaskellLint 26augroup 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
30augroup END 30augroup 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 @@
1setlocal wrap 1setlocal wrap
2setlocal number
2nnoremap j gj 3nnoremap j gj
3nnoremap k gk 4nnoremap k gk
5let g:tex_conceal="abdmgs"
6let 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
106set signcolumn=yes 106set signcolumn=yes
107set inccommand=split 107set inccommand=split
108set showmatch 108set showmatch
109set diffopt+=vertical
109 110
110let g:netrw_browsex_viewer= "xdg-open" 111let 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
163let g:fzf_colors = 164let 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'],