diff options
| -rw-r--r-- | pkgs/vim/conf/rc.vim | 6 | ||||
| -rw-r--r-- | pkgs/vim/custom.nix | 1 | ||||
| -rw-r--r-- | pkgs/vim/plugins.nix | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim index 090c08b..4072bf2 100644 --- a/pkgs/vim/conf/rc.vim +++ b/pkgs/vim/conf/rc.vim @@ -45,10 +45,16 @@ autocmd InsertLeave * :setlocal hlsearch autocmd FileType scheme setlocal shiftwidth=2 tabstop=2 expandtab autocmd FileType lisp setlocal shiftwidth=2 tabstop=2 expandtab autocmd FileType racket setlocal shiftwidth=2 tabstop=2 expandtab +autocmd FileType haskell setlocal shiftwidth=2 tabstop=4 softtabstop=2 shiftround expandtab autocmd FileType pandoc setlocal nonumber autoread autocmd FileType pandoc let g:airline#extensions#whitespace#checks=['indent', 'trailing', 'long'] autocmd FileType tex set conceallevel=2 +" select previous line on file reload, useful when cycling file extensions +autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g`\" zz" | endif +nnoremap <Tab> :CounterpointNext<CR> +nnoremap <S-Tab> :CounterpointPrevious<CR> + nnoremap <C-left> gT nnoremap <C-right> gt nnoremap <space> @q diff --git a/pkgs/vim/custom.nix b/pkgs/vim/custom.nix index 0198ac7..a6c86af 100644 --- a/pkgs/vim/custom.nix +++ b/pkgs/vim/custom.nix @@ -20,6 +20,7 @@ in "vim-addon-nix" "vim-autoformat" "vim-polyglot" + "vim-counterpoint" "vim-csexact" "vim-color-akr" ];} diff --git a/pkgs/vim/plugins.nix b/pkgs/vim/plugins.nix index 41360e3..801fb1e 100644 --- a/pkgs/vim/plugins.nix +++ b/pkgs/vim/plugins.nix @@ -19,6 +19,14 @@ in { sha256 = "0jx9xybjswnaa6v7hhfqm2nyd5v54xjd02ikw56wm7h6sfgchllx"; }; }; + "vim-counterpoint" = buildVimPlugin { + name = "vim-counterpoint"; + src = fetchgit { + url = "https://github.com/jpetrie/vim-counterpoint"; + rev = "93d8fd9d18a378ab3db39411300716129358211c"; + sha256 = "02spr4mhj2035q45j8bf502jgpq76a518nv913zx46byfbl69lps"; + }; + }; "vim-color-akr" = buildVimPlugin { name = "vim-csexact"; src = ./conf/vim-color-akr; |