update

Author: Vladimir Ciobanu

.config/nvim/coc-settings.json

@@ -1,24 +1,45 @@
 {
     "languageserver": {
-      "haskell": {
-        "command": "hie-wrapper",
-        "rootPatterns": [
-          ".stack.yaml",
-          "cabal.config",
-          "package.yaml"
-        ],
-        "filetypes": [
-          "hs",
-          "lhs",
-          "haskell"
-        ],
-        "initializationOptions": {
-          "languageServerHaskell": {
-              "hlintOn": true,
-              "maxNumberOfProblems": 10,
-              "completionSnippetsOn": true
+        "purescript": {
+            "command": "npx",
+            "args": ["purescript-language-server", "--stdio"],
+            "rootPatterns": [
+                "bower.json",
+                "psc-package.json",
+                "spago.dhall",
+            ],
+            "filetypes": [ "purescript" ],
+            "settings": {
+                "purescript": {
+                  "addSpagoSources": true,
+                  "addNpmPath": true,
+                  "buildCommand": "spago build --purs-args --json-errors",
+                  "editorMode": true
+                },
+            },
+        },
+        "dhall": {
+            "command": "dhall-lsp-server",
+            "filetypes":
+                [ "dhall"
+                ],
+        },
+        "haskell": {
+            "command": "ghcide",
+            "args": ["--lsp"],
+            "rootPatterns": [
+              "stack.yaml",
+              ".stack.yaml",
+              ".hie-bios",
+              "BUILD.bazel",
+              "cabal.config",
+              "package.yaml"
+            ],
+            "filetypes": [
+              "hs",
+              "lhs",
+              "haskell"
+            ],
           }
         },
-      }
-    }
 }

.config/nvim/init.vim

@@ -1,6 +1,6 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Plugins
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " This uses the `vim-plug` manager:
 " https://github.com/junegunn/vim-plug
 "
@@ -26,6 +26,12 @@ Plug 'junegunn/fzf', {
 Plug 'junegunn/fzf.vim'
 " Multiple cursor edit. Select word, use <C-n> then c or something.
 Plug 'terryma/vim-multiple-cursors'
+" Which-key
+Plug 'liuchengxu/vim-which-key'
+" Buffer delete
+Plug 'moll/vim-bbye'
+" Highlight yanked text for a bit
+Plug 'machakann/vim-highlightedyank'
 
 """ Generic coding helpers
 " gc / gcc for commenting stuff
@@ -38,13 +44,15 @@ Plug 'tpope/vim-surround'
 Plug 'luochen1990/rainbow'
 " Indentation guides
 Plug 'nathanaelkane/vim-indent-guides'
+" %S stuff
+Plug 'tpope/vim-abolish'
 
 """ Git
 " Basic git plugin, g? for help in gstatus
 Plug 'tpope/vim-fugitive'
 " Additional plugin for github (pretty much for :Gbrowse I think)
 Plug 'tpope/vim-rhubarb'
-" Git gutter, must read more 
+" Git gutter, must read more
 Plug 'airblade/vim-gitgutter'
 " Try out: https://github.com/jreybert/vimagit
 
@@ -56,14 +64,14 @@ Plug 'tpope/vim-markdown'
 
 """ Haskell
 " Indentation and syntax highlighting
-Plug 'neovimhaskell/haskell-vim'
+Plug 'vladciobanu/haskell-vim'
 Plug 'nbouscal/vim-stylish-haskell'
 " <C-y> to insert function above, [[ and ]] to navigate
 Plug 'edkolev/curry.vim'
 "Plug 'enomsg/vim-haskellConcealPlus'
 
 """ PureScript
-"Plug 'purescript-contrib/purescript-vim'
+Plug 'purescript-contrib/purescript-vim'
 "Plug 'FrigoEU/psc-ide-vim'
 
 """ Rust
@@ -85,16 +93,31 @@ Plug 'vim-syntastic/syntastic'
 """ Agda
 Plug 'derekelkins/agda-vim'
 
+""" Dhall
+Plug 'vmchale/dhall-vim'
+
 """ Colorschemes
 Plug 'fatih/molokai'
 Plug 'lifepillar/vim-solarized8'
 
+""" Testing
+Plug 'xuyuanp/nerdtree-git-plugin'
+Plug 'mbbill/undotree'
+Plug 'kshenoy/vim-signature'
+Plug 'plasticboy/vim-markdown'
+Plug 'bronson/vim-trailing-whitespace'
+Plug 'vimwiki/vimwiki'
+
+Plug 'justinmk/vim-sneak'
 " Initialize plugin system
 call plug#end()
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Generic vim setup
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" vimwiki
+set nocompatible
+
 " Leader setup
 let mapleader = ' '
 let maplocalleader = ','
@@ -120,7 +143,7 @@ set incsearch
 set hlsearch
 set smartcase
 " Not sure what these are
-au InsertEnter * set nocursorline
+" au InsertEnter * set nocursorline
 au InsertLeave * set cursorline
 set cursorline
 set cursorcolumn
@@ -129,6 +152,12 @@ set ruler
 set scrolloff=3
 " Disable folding, what does this do?
 set nofoldenable
+" Basic setup for text files
+" autocmd FileType md setlocal textwidth=80 spell
+" autocmd FileType txt setlocal textwidth=80 spell
+" autocmd FileType tex setlocal textwidth=80 spell
+" Show substitutions as you type them
+set inccommand=nosplit
 
 """ Plugin-specific
 " for vim-devicons
@@ -158,6 +187,15 @@ let g:haskell_conceal = 0
 let g:haskell_conceal_wide = 0
 let g:haskell_coneal_enumerations = 0
 let g:haskell_hsp = 0
+" haskell-vim
+let g:haskell_indent_if = 4
+let g:haskell_indent_case = 4
+let g:haskell_indent_let = 4
+let g:haskell_indent_where = 2
+let g_haskell_indent_before_where = 2
+let g_haskell_indent_after_bare_where = 2
+let g_haskell_indent_do = 4
+let g_haskell_indent_in = 2
 
 " Idris
 let g:idris_conceal = 1
@@ -166,40 +204,41 @@ let g:idris_conceal = 1
 " TODO: there's a bug with 'S'
 let hscoptions="STEMsrl↱w-tBQZNDC"
 
-" CoC setup
-let g:LanguageClient_rootMarkers = ['*.cabal', 'stack.yaml']
-let g:LanguageClient_serverCommands = {
-    \ 'haskell': ['ghcide', '--lsp'],
-    \ }
+" coc.nvim
+set hidden
+set nobackup
+set nowritebackup
+set shortmess+=c
+set signcolumn=yes
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Keyboard customization
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Which-key
+nnoremap <silent> <leader>      :<c-u>WhichKeyVisual '<Space>'<CR>
+nnoremap <silent> <localleader> :<c-u>WhichKeyVisual  ','<CR>
+
 " Light/dark theme
 map <Leader>cl :set background=light<cr>:colorscheme solarized8<cr>
 map <Leader>cd :set background=dark<cr>:colorscheme molokai<cr>
 
 " NERDTree
 map <Leader>nt :NERDTreeToggle<CR>
 
+map <Leader>ar  :Tabularize /
+
 " fzf - find - f
-map <Leader><Space> :Files<CR>
+map <Leader><Space> :call fzf#run(fzf#wrap({'source': 'git ls-files --exclude-standard --others --cached'}))<CR>
 map <Leader>fg      :GFiles?<CR>
 map <Leader>fb      :Buffers<CR>
+map <Leader>cr      :Rg<CR>
 map <Leader>bb      :Buffers<CR>
 map <Leader>ft      :tag <C-r><C-w><CR>
 map <Leader>fc      :Commits<CR>
 
 " window - w
-map <Leader>ws :vsplit<CR>
-map <Leader>we :split<CR>
-
-map <Leader>ww <C-w><C-w>
-
-map <Leader>wl <C-w><C-l>
-map <Leader>wh <C-w><C-h>
-map <Leader>wj <C-w><C-j>
-map <Leader>wk <C-w><C-k>
+map <Leader>ss :vsplit<CR>
+map <Leader>se :split<CR>
 
 map <Leader>wr <C-w>r
 
@@ -210,11 +249,12 @@ map <Leader>th :split<CR>:term<CR>
 tnoremap <Esc> <C-\><C-n>
 
 " buffer - b
-map <Leader>bd :bd<Cr>
+map <Leader>bd :Bd<Cr>
 
 " git stuff - g
 map <Leader>gg :Gstatus<CR>
 map <Leader>gs :Gstatus<CR>
+map <Leader>gp :Gpush<CR>
 map <Leader>gd :Gvdiff<CR>
 map <Leader>gsd :Gdivv<CR>
 map <Leader>dh :diffget //2<CR>:diffupdate<CR>
@@ -249,8 +289,6 @@ nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 
-
-
 " Use K to show documentation in preview window
 nnoremap <silent> K :call <SID>show_documentation()<CR>
 
@@ -265,15 +303,14 @@ endfunction
 " Highlight symbol under cursor on CursorHold ?? this doesnt seem to work
 autocmd CursorHold * silent call CocActionAsync('highlight')
 
-" Remap for rename current word -- doesn't seem to work yet
+" Remap for rename current word
 nmap <leader>rn <Plug>(coc-rename)
 
-" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
-xmap <leader>a  <Plug>(coc-codeaction-selected)
-nmap <leader>a  <Plug>(coc-codeaction-selected)
-
 " Remap for do codeAction of current line
 nmap <leader>ac  <Plug>(coc-codeaction)
 " Fix autofix problem of current line
 nmap <leader>qf  <Plug>(coc-fix-current)
 
+""" Under test
+nnoremap <leader>ut :UndotreeToggle<cr>
+