better tex and haskell ftpluginsHEADmaster

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 @@
                 "cformatpath": "/bin/clang-format"
             }
         },
-        "haskell": {
-            "command": "haskell-language-server-wrapper",
-            "args": ["--lsp"],
-            "rootPatterns": [
-                "*.cabal",
-                "stack.yaml",
-                "cabal.project",
-                "cabal.project.local",
-                "package.yaml",
-                "hie.yaml"
-            ],
-            "filetypes": [
-                "hs",
-                "lhs",
-                "haskell"
-            ],
-            "initializationOptions": {
-                "languageServerHaskell": {
-                    "hlintOn": true 
-                }
-            }
-        },
         "lua": {
             "command": "lua-lsp",
             "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
 
 augroup HaskellLint
     autocmd!
-    autocmd BufWritePost *.hs | silent make! <afile> | silent redraw!
+    autocmd BufWritePost *.hs | call s:RunStylishHaskell() | silent make! <afile> | silent redraw!
     autocmd QuickFixCmdPost [^l]* cwindow
 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 @@
 setlocal wrap
+setlocal number
 nnoremap j gj
 nnoremap k gk
+let g:tex_conceal="abdmgs"
+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
 set signcolumn=yes
 set inccommand=split
 set showmatch
+set diffopt+=vertical
 
 let g:netrw_browsex_viewer= "xdg-open"
 
@@ -161,9 +162,9 @@ let g:rustfmt_autosave = 1
 
 " fzf colors
 let g:fzf_colors =
-\ { 'fg':      ['fg', 'Normal'],
-  \ 'bg':      ['bg', 'Normal'],
-  \ 'hl':      ['fg', 'Comment'],
+\ { 'fg':      ['fg', 'Noise'],
+  \ 'bg':      ['bg', 'Noise'],
+  \ 'hl':      ['fg', 'Statement'],
   \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
   \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
   \ 'hl+':     ['fg', 'Statement'],