summaryrefslogtreecommitdiffstats
path: root/lass/2configs/vim.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-06-07 00:17:23 +0200
committermakefu <github@syntax-fehler.de>2022-06-07 00:17:23 +0200
commit9c1799914a2e6f2dc736fe2eaad7134602a3d837 (patch)
tree08347f7f29bc00c3b40be2a49e069268c0163716 /lass/2configs/vim.nix
parent1e405be047a79e1abd0c28e52b5009b9675909b8 (diff)
parentbdc80e55411e197f89990e988f8b7e67c084d3d3 (diff)
Merge remote-tracking branch 'lass/master' into 22.05
Diffstat (limited to 'lass/2configs/vim.nix')
-rw-r--r--lass/2configs/vim.nix62
1 files changed, 18 insertions, 44 deletions
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 36ce3d74c..210133f48 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -21,6 +21,7 @@ let
set backup
set backupdir=${dirs.backupdir}/
set directory=${dirs.swapdir}//
+ set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbreak=¬
set hlsearch
set incsearch
set ttymouse=sgr
@@ -51,7 +52,7 @@ let
filetype plugin indent on
set t_Co=256
- colorscheme hack
+ colorscheme dim
syntax on
au Syntax * syn match Garbage containedin=ALL /\s\+$/
@@ -114,10 +115,17 @@ let
" copy/paste from/to xclipboard
set clipboard=unnamedplus
+
+ " use fzf to switch files
+ nnoremap <C-p> :FZF<CR>
+ nnoremap <C-l> :Rg<CR>
+ let g:fzf_layout = { 'down': '~15%' }
'';
extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
pkgs.vimPlugins.undotree
+ pkgs.vimPlugins.fzf-vim
+ pkgs.vimPlugins.fzfWrapper
(pkgs.vimUtils.buildVimPlugin {
name = "file-line-1.0";
src = pkgs.fetchFromGitHub {
@@ -127,49 +135,15 @@ let
sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0";
};
})
- ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
- name = "hack";
- in {
- name = "vim-color-${name}-1.0.2";
- destination = "/colors/${name}.vim";
- text = /* vim */ ''
- set background=dark
- hi clear
- if exists("syntax_on")
- syntax clear
- endif
-
- let colors_name = ${toJSON name}
-
- hi Normal ctermbg=016
- hi Comment ctermfg=255
- hi Constant ctermfg=229
- hi Identifier ctermfg=123
- hi Function ctermfg=041
- hi Statement ctermfg=167
- hi PreProc ctermfg=167
- hi Type ctermfg=046
- hi Delimiter ctermfg=251
- hi Special ctermfg=146
-
- hi Garbage ctermbg=124
- hi TabStop ctermbg=020
- hi NBSP ctermbg=056
- hi NarrowNBSP ctermbg=097
- hi Todo ctermfg=174 ctermbg=NONE
-
- hi NixCode ctermfg=190
- hi NixData ctermfg=149
- hi NixQuote ctermfg=119
-
- hi diffNewFile ctermfg=207
- hi diffFile ctermfg=207
- hi diffLine ctermfg=207
- hi diffSubname ctermfg=207
- hi diffAdded ctermfg=010
- hi diffRemoved ctermfg=009
- '';
- })))
+ (pkgs.vimUtils.buildVimPlugin {
+ name = "vim-dim-1.1.0";
+ src = pkgs.fetchFromGitHub {
+ owner = "jeffkreeftmeijer";
+ repo = "vim-dim";
+ rev = "1.1.0";
+ sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g=";
+ };
+ })
((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
name = "vim";
in {