From 7e5928c12a9a51cb0146e89c000752e96e126e6d Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Tue, 21 Dec 2021 09:24:36 +0200 Subject: [PATCH 1/4] Add color def for FZF vim --- pkgs/vim/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index 28aa5d6..43a2bba 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -292,6 +292,23 @@ let autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END + " Customize fzf colors to match your color scheme + " - fzf#wrap translates this to a set of `--color` options + let g:fzf_colors = + \ { 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Comment'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'hl+': ['fg', 'Statement'], + \ 'info': ['fg', 'PreProc'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'Conditional'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'] } + " Extra options ${extraOptions} ''; From 5d2d2ee13ca117d2ba06f6f75f562a4f86dc102f Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Tue, 21 Dec 2021 09:29:52 +0200 Subject: [PATCH 2/4] Revert "Add color def for FZF vim" This reverts commit 7e5928c12a9a51cb0146e89c000752e96e126e6d. --- pkgs/vim/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index 43a2bba..28aa5d6 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -292,23 +292,6 @@ let autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END - " Customize fzf colors to match your color scheme - " - fzf#wrap translates this to a set of `--color` options - let g:fzf_colors = - \ { 'fg': ['fg', 'Normal'], - \ 'bg': ['bg', 'Normal'], - \ 'hl': ['fg', 'Comment'], - \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], - \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], - \ 'hl+': ['fg', 'Statement'], - \ 'info': ['fg', 'PreProc'], - \ 'border': ['fg', 'Ignore'], - \ 'prompt': ['fg', 'Conditional'], - \ 'pointer': ['fg', 'Exception'], - \ 'marker': ['fg', 'Keyword'], - \ 'spinner': ['fg', 'Label'], - \ 'header': ['fg', 'Comment'] } - " Extra options ${extraOptions} ''; From d5f91239be7d008dfa02ace04fa03b59e89ea5bd Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Tue, 21 Dec 2021 09:48:16 +0200 Subject: [PATCH 3/4] Space change --- pkgs/vim/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index 28aa5d6..7daff1b 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -292,6 +292,7 @@ let autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END + " Extra options ${extraOptions} ''; From 45dbec049d3ed4a6b372d480d8e3bd72ef6d8d6d Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Tue, 21 Dec 2021 10:17:02 +0200 Subject: [PATCH 4/4] Set fzf window location --- pkgs/vim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index 7daff1b..e9a2a81 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -292,6 +292,9 @@ let autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END + " Use down window FZF + let g:fzf_layout = { 'down': '40%' } + " Extra options ${extraOptions}