diff options
| author | lassulus <lass@aidsballs.de> | 2015-05-29 02:43:46 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-05-29 02:43:46 +0200 |
| commit | 224c8965eef21b3f003d1ffd28cd0643765545d8 (patch) | |
| tree | 6adcf6785db17e32a3ba61b9be445e8d30e481dd /modules/lass | |
| parent | bcd6a13478397310a2d69c39bfc9ebff5a1c0ade (diff) | |
update vim.nix
Diffstat (limited to 'modules/lass')
| -rw-r--r-- | modules/lass/vim.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/modules/lass/vim.nix b/modules/lass/vim.nix index 56a20c383..1000b8da6 100644 --- a/modules/lass/vim.nix +++ b/modules/lass/vim.nix @@ -13,8 +13,8 @@ let in { - environment.systemPackages = with pkgs; [ - (vim_configurable.customize { + environment.systemPackages = [ + (pkgs.vim_configurable.customize { name = "vim"; vimrcConfig.customRC = '' @@ -58,8 +58,6 @@ in { "Tabwidth set ts=2 sts=2 sw=2 et - autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et - autocmd BufRead *.hs set ts=4 sts=4 sw=4 et " create Backup/tmp/undo dirs function! InitBackupDir() @@ -90,12 +88,24 @@ in { set viminfo='20,<1000,s100,h,n~/.vim/tmp/info set undodir=$HOME/.vim/undo set undofile + + " highlight whitespaces + highlight ExtraWhitespace ctermbg=red guibg=red + match ExtraWhitespace /\s\+$/ + autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ + autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/ + autocmd InsertLeave * match ExtraWhitespace /\s\+$/ + autocmd BufWinLeave * call clearmatches() + + "ft specific stuff + autocmd BufRead *.js,*.json set ts=2 sts=2 sw=2 et + autocmd BufRead *.hs set ts=4 sts=4 sw=4 et ''; - vimrcConfig.vam.knownPlugins = vimPlugins // customPlugins; + vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins; vimrcConfig.vam.pluginDictionaries = [ - { names = [ "Gundo" "commentary" "vim-addon-nix" ]; } - { name = "mustang2"; } + { names = [ "Gundo" "commentary" "mustang2" ]; } + { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } ]; }) |