summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/editor
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2023-01-19 14:12:03 +0100
committerlassulus <lassulus@lassul.us>2023-01-19 14:12:03 +0100
commitc89f76a0bd4f5060ead3d942387c37aff1350ec8 (patch)
tree6715b9053f54a97a5b72a4dd8a06a865326b5a91 /makefu/2configs/editor
parentb51998cfae7b6fe892f9f0f9a2c0ffcfeeded0ba (diff)
parentcb7ebd1c9120eb03ded2334db4c41fe6a0e26b88 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/editor')
-rw-r--r--makefu/2configs/editor/vim.nix3
-rw-r--r--makefu/2configs/editor/vimrc6
2 files changed, 7 insertions, 2 deletions
diff --git a/makefu/2configs/editor/vim.nix b/makefu/2configs/editor/vim.nix
index b37f2409a..f53be58ff 100644
--- a/makefu/2configs/editor/vim.nix
+++ b/makefu/2configs/editor/vim.nix
@@ -11,7 +11,8 @@
"YouCompleteMe"
#"UltiSnips"
# vim-nix handles indentation better but does not perform sanity
- "vim-addon-nix"
+ "vim-nix"
+ # "vim-addon-nix"
"vim-better-whitespace"
];
};
diff --git a/makefu/2configs/editor/vimrc b/makefu/2configs/editor/vimrc
index 309e81a05..e24d29974 100644
--- a/makefu/2configs/editor/vimrc
+++ b/makefu/2configs/editor/vimrc
@@ -7,7 +7,7 @@ set listchars=tab:▸\
filetype off
filetype plugin indent on
-colorscheme darkblue
+colorscheme desert
set background=dark
set number
@@ -49,6 +49,10 @@ set matchtime=3
set hlsearch
autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
+hi MatchParen cterm=none ctermbg=green ctermfg=blue
+
+let g:better_whitespace_enabled=1
+let g:strip_whitespace_on_save=1
" save on focus lost