diff options
| author | lassulus <lassulus@lassul.us> | 2023-01-19 14:11:01 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2023-01-19 14:11:01 +0100 |
| commit | b51998cfae7b6fe892f9f0f9a2c0ffcfeeded0ba (patch) | |
| tree | ca76ec46d32a99edacfd2d0be19a7f1ef410fe76 /tv/5pkgs/vim | |
| parent | 347bb9ae00f8f1b6942f94d4c983593052a5c227 (diff) | |
| parent | 57abca263fe86259807e5597d1c8f11c3c3acd44 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/5pkgs/vim')
| -rw-r--r-- | tv/5pkgs/vim/fzf.nix | 6 | ||||
| -rw-r--r-- | tv/5pkgs/vim/hack.nix | 3 | ||||
| -rw-r--r-- | tv/5pkgs/vim/tv.nix | 11 |
3 files changed, 6 insertions, 14 deletions
diff --git a/tv/5pkgs/vim/fzf.nix b/tv/5pkgs/vim/fzf.nix index 14b6900b5..e24bee5d4 100644 --- a/tv/5pkgs/vim/fzf.nix +++ b/tv/5pkgs/vim/fzf.nix @@ -2,10 +2,10 @@ # cannot use pkgs.vimPlugins.fzf-vim as it's missing :Rg pkgs.vimUtils.buildVimPlugin { - name = "fzf-2018-11-14"; + name = "fzf-2023-01-16"; src = pkgs.fetchgit { url = https://github.com/junegunn/fzf.vim; - rev = "ad1833ecbc9153b6e34a4292dc089a58c4bcb8dc"; - sha256 = "1z2q71q6l9hq9fqfqpj1svhyk4yk1bzw1ljhksx4bnpz8gkfbx2m"; + rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; + hash = "sha256-eCCk+Q596Ljjdtjd0cYGqR77K3Me5gf+ts5icP22S3Y="; }; } diff --git a/tv/5pkgs/vim/hack.nix b/tv/5pkgs/vim/hack.nix index 922d85ba2..d378f355b 100644 --- a/tv/5pkgs/vim/hack.nix +++ b/tv/5pkgs/vim/hack.nix @@ -42,5 +42,8 @@ in { hi diffRemoved ctermfg=009 hi Search cterm=NONE ctermbg=216 + + hi TabLine cterm=underline guifg=#424242 guibg=#232323 + hi TabLineFill cterm=underline guifg=#424242 guibg=#232323 ''; })) diff --git a/tv/5pkgs/vim/tv.nix b/tv/5pkgs/vim/tv.nix index dee6b2df8..10816ce96 100644 --- a/tv/5pkgs/vim/tv.nix +++ b/tv/5pkgs/vim/tv.nix @@ -2,17 +2,6 @@ pkgs.tv.vim.makePlugin (pkgs.write "vim-tv" { # - # Haskell - # - "/ftplugin/haskell.vim".text = '' - if exists("g:vim_tv_ftplugin_haskell_loaded") - finish - endif - let g:vim_tv_ftplugin_haskell_loaded = 1 - - setlocal iskeyword+=' - ''; - # # TODO # "/ftdetect/todo.vim".text = '' |