diff options
Diffstat (limited to 'pkgs/applications/editors/vim/plugins/overrides.nix')
| -rw-r--r-- | pkgs/applications/editors/vim/plugins/overrides.nix | 196 |
1 files changed, 152 insertions, 44 deletions
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fa175badfd7bc..f7e1645d707fd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -19,8 +19,10 @@ , code-minimap , dasht , direnv +, fish , fzf , gawk +, git , gnome , himalaya , jq @@ -30,12 +32,15 @@ , meson , nim , nodePackages +, pandoc , parinfer-rust +, ripgrep , skim , sqlite , statix , stylish-haskell , tabnine +, tmux , tup , vim , which @@ -45,9 +50,7 @@ , nodejs , xdotool , xorg - -# test dependencies -, neovim-unwrapped +, zsh # command-t dependencies , rake @@ -100,7 +103,6 @@ , golint , gomodifytags , gopls -, gotags , gotools , iferr , impl @@ -133,6 +135,78 @@ self: super: { ''; }); + cmp-clippy = super.cmp-clippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp plenary-nvim ]; + }); + + cmp-copilot = super.cmp-copilot.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp copilot-vim ]; + }); + + cmp-dap = super.cmp-dap.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-dap ]; + }); + + cmp-dictionary = super.cmp-dictionary.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-digraphs = super.cmp-digraphs.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-fish = super.cmp-fish.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fish ]; + }); + + cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-git = super.cmp-git.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp curl git ]; + }); + + cmp-greek = super.cmp-greek.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-look = super.cmp-look.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp neosnippet-vim ]; + }); + + cmp-npm = super.cmp-npm.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nodejs plenary-nvim ]; + }); + + cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; + }); + + cmp-rg = super.cmp-rg.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ripgrep ]; + }); + + cmp-snippy = super.cmp-snippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-snippy ]; + }); + cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; @@ -142,6 +216,28 @@ self: super: { ''; }); + cmp-tmux = super.cmp-tmux.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp tmux ]; + }); + + cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vim-lsp ]; + }); + + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp zsh ]; + }); + + coc-nginx = buildVimPluginFrom2Nix { + pname = "coc-nginx"; + inherit (nodePackages."@yaegassy/coc-nginx") version meta; + src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; + }; + command-t = super.command-t.overrideAttrs (old: { buildInputs = [ ruby rake ]; buildPhase = '' @@ -232,15 +328,15 @@ self: super: { }; }); - diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + diffview-nvim = super.diffview-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; doInstallCheck = true; nvimRequireCheck = "diffview"; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' + direnv-vim = super.direnv-vim.overrideAttrs (old: { + preFixup = old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" @@ -280,7 +376,7 @@ self: super: { patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; - version = old.version; + inherit (old) version; }) ]; configurePhase = '' @@ -294,6 +390,10 @@ self: super: { ''; }); + fuzzy-nvim = super.fuzzy-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-fzy-native-nvim ]; + }); + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. @@ -345,31 +445,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); - - plenary-nvim = super.plenary-nvim.overrideAttrs (old: { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; - nvimRequireCheck = "plenary"; - }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; @@ -385,6 +464,15 @@ self: super: { ''; }; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; + }; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -559,7 +647,19 @@ self: super: { configurePhase = "cd vim"; }); - parinfer-rust = parinfer-rust; + inherit parinfer-rust; + + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; + }); range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { dependencies = with self; [ cmd-parser-nvim ]; @@ -576,7 +676,7 @@ self: super: { skim = buildVimPluginFrom2Nix { pname = "skim"; - version = skim.version; + inherit (skim) version; src = skim.vim; }; @@ -689,16 +789,16 @@ self: super: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); - telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { - dependencies = with self; [ telescope-nvim ]; - }); - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; buildPhase = "make"; meta.platforms = lib.platforms.all; }); + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -874,7 +974,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0="; + cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo="; }; in '' @@ -926,11 +1026,12 @@ self: super: { vim-go = super.vim-go.overrideAttrs (old: let binPath = lib.makeBinPath [ + # TODO: package commented packages asmfmt delve errcheck go-motion - go-tools + go-tools # contains staticcheck gocode gocode-gomod godef @@ -939,18 +1040,20 @@ self: super: { golangci-lint gomodifytags gopls - gotags + # gorename + # gotags gotools + # guru iferr impl + # keyify reftools + # revive ]; in { postPatch = '' - ${gnused}/bin/sed \ - -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \ - -i autoload/go/config.vim + sed -i autoload/go/config.vim -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' ''; }); @@ -1000,13 +1103,13 @@ self: super: { vim-markdown-composer = let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; + cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; }; in - super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + super.vim-markdown-composer.overrideAttrs (old: { preFixup = '' substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ --replace "s:plugin_root . '/target/release/markdown-composer'" \ @@ -1156,6 +1259,7 @@ self: super: { "coc-cmake" "coc-css" "coc-diagnostic" + "coc-docker" "coc-emmet" "coc-eslint" "coc-explorer" @@ -1179,12 +1283,16 @@ self: super: { "coc-r-lsp" "coc-rls" "coc-rust-analyzer" + "coc-sh" "coc-smartf" "coc-snippets" "coc-solargraph" + "coc-sqlfluff" "coc-stylelint" + "coc-sumneko-lua" "coc-tabnine" "coc-texlab" + "coc-toml" "coc-tslint" "coc-tslint-plugin" "coc-tsserver" |