From 9243f2eb7edee3ec7bd859cd1b7ae1e23f6a844c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 12:13:59 -0600 Subject: [PATCH 1/7] vimPlugins: cleanup unused imports --- .../editors/vim/plugins/overrides.nix | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 69319e27a835..8a45a0d3c4f1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4,6 +4,7 @@ # nixpkgs functions buildGoModule, buildVimPlugin, + callPackage, fetchFromGitHub, fetchFromSourcehut, fetchpatch, @@ -14,7 +15,6 @@ fetchYarnDeps, mkYarnModules, python3, - rustPlatform, # Misc dependencies arrow-cpp, coc-clangd, @@ -35,10 +35,11 @@ languagetool, llvmPackages, meson, - notmuch, neovim-unwrapped, nim1, nodePackages, + nodejs, + notmuch, openscad, parinfer-rust, phpactor, @@ -56,15 +57,14 @@ typescript, vim, which, - xkb-switch, - ycmd, - zoxide, - nodejs, xdotool, + xkb-switch, xorg, xxd, + ycmd, zathura, zenity, + zoxide, zsh, # codeium-nvim dependencies codeium, @@ -78,25 +78,14 @@ cmake, icu, ncurses, - # nvim-treesitter dependencies - callPackage, # Preview-nvim dependencies md-tui, - darwin, # sved dependencies glib, gobject-introspection, wrapGAppsHook3, writeText, - # sniprun dependencies - bashInteractive, - coreutils, curl, - gnugrep, - gnused, - makeWrapper, - procps, - pkg-config, # vim-agda dependencies agda, # vim-go dependencies From c964fbf71167b190da72c8d997d67d2ba944c531 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 12:17:20 -0600 Subject: [PATCH 2/7] vimPlugins: cleanup typos --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8a45a0d3c4f1..bacc128d49ad 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2393,7 +2393,7 @@ in playground = super.playground.overrideAttrs { dependencies = with self; [ - # we need the 'query' grammer to make + # we need the 'query' grammar to make (nvim-treesitter.withPlugins (p: [ p.query ])) ]; nvimRequireCheck = "nvim-treesitter-playground"; @@ -3157,7 +3157,7 @@ in dependencies = [ self.vim-maktaba ]; }; - # Due to case-sensitivety issues, the hash differs on Darwin systems, see: + # Due to case-sensitivity issues, the hash differs on Darwin systems, see: # https://github.com/NixOS/nixpkgs/issues/157609 vim-colorschemes = super.vim-colorschemes.overrideAttrs (old: { src = old.src.overrideAttrs (srcOld: { From 637fb7239d59f316baf70ce625e59a0e71e9db70 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 12:28:58 -0600 Subject: [PATCH 3/7] vimPlugins: replace -> replace-fail --- .../editors/vim/plugins/overrides.nix | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index bacc128d49ad..738d66459bdd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -310,13 +310,13 @@ in preFixup = '' substituteInPlace "$out"/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + --replace-fail "let g:clang_library_path = '' + "''" + '' " "let g:clang_library_path='${lib.getLib llvmPackages.libclang}/lib/libclang.so'" substituteInPlace "$out"/plugin/libclang.py \ - --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" + --replace-fail "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" ''; }; @@ -667,8 +667,8 @@ in ]; buildPhase = '' substituteInPlace lua/wincent/commandt/lib/Makefile \ - --replace '/bin/bash' 'bash' \ - --replace xcrun "" + --replace-fail '/bin/bash' 'bash' \ + --replace-fail xcrun "" make build rm ruby/command-t/ext/command-t/*.o ''; @@ -742,7 +742,7 @@ in copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ - --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ + --replace-fail " let node = get(g:, 'copilot_node_command', ''\'''\')" \ " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" ''; @@ -863,7 +863,7 @@ in denops-vim = super.denops-vim.overrideAttrs { postPatch = '' # Use Nix's Deno instead of an arbitrary install - substituteInPlace ./autoload/denops.vim --replace "call denops#_internal#conf#define('denops#deno', 'deno')" "call denops#_internal#conf#define('denops#deno', '${deno}/bin/deno')" + substituteInPlace ./autoload/denops.vim --replace-fail "call denops#_internal#conf#define('denops#deno', 'deno')" "call denops#_internal#conf#define('denops#deno', '${deno}/bin/deno')" ''; }; @@ -912,7 +912,7 @@ in old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ - --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + --replace-fail "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" ''; }); @@ -1009,7 +1009,7 @@ in ]; configurePhase = '' substituteInPlace Makefile \ - --replace \ + --replace-fail \ "nim c" \ "nim c --nimcache:$TMP --path:${nimpy} --path:${binaryheap}" ''; @@ -1217,7 +1217,7 @@ in postPatch = '' substituteInPlace lua/image/magick.lua \ - --replace @nix_magick@ ${luajitPackages.magick} + --replace-fail @nix_magick@ ${luajitPackages.magick} ''; nvimRequireCheck = "image"; @@ -1267,7 +1267,7 @@ in buildInputs = [ curl ]; postPatch = '' substituteInPlace lua/kulala/config/init.lua \ - --replace 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' + --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' ''; nvimRequireCheck = "kulala"; }; @@ -1559,9 +1559,9 @@ in minimap-vim = super.minimap-vim.overrideAttrs { preFixup = '' substituteInPlace $out/plugin/minimap.vim \ - --replace "code-minimap" "${code-minimap}/bin/code-minimap" + --replace-fail "code-minimap" "${code-minimap}/bin/code-minimap" substituteInPlace $out/bin/minimap_generator.sh \ - --replace "code-minimap" "${code-minimap}/bin/code-minimap" + --replace-fail "code-minimap" "${code-minimap}/bin/code-minimap" ''; doInstallCheck = true; @@ -2191,7 +2191,7 @@ in nvim-teal-maker = super.nvim-teal-maker.overrideAttrs { postPatch = '' substituteInPlace lua/tealmaker/init.lua \ - --replace cyan ${luaPackages.cyan}/bin/cyan + --replace-fail cyan ${luaPackages.cyan}/bin/cyan ''; vimCommandCheck = "TealBuild"; }; @@ -2387,7 +2387,7 @@ in ; postPatch = '' substituteInPlace plugin/phpactor.vim \ - --replace "g:phpactorpath = expand(':p:h') . '/..'" "g:phpactorpath = '${phpactor}'" + --replace-fail "g:phpactorpath = expand(':p:h') . '/..'" "g:phpactorpath = '${phpactor}'" ''; }; @@ -2399,6 +2399,7 @@ in nvimRequireCheck = "nvim-treesitter-playground"; }; + # TODO: runtimedeps plenary-nvim = super.plenary-nvim.overrideAttrs { postPatch = '' sed -Ei lua/plenary/curl.lua \ @@ -2466,7 +2467,7 @@ in patches = [ ./patches/ranger.nvim/fix-paths.patch ]; postPatch = '' - substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}/bin/ranger + substituteInPlace lua/ranger-nvim.lua --replace-fail '@ranger@' ${ranger}/bin/ranger ''; nvimRequireCheck = "ranger-nvim"; }; @@ -2475,8 +2476,8 @@ in patches = [ ./patches/aider.nvim/fix-paths.patch ]; postPatch = '' - substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider - substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider + substituteInPlace lua/aider.lua --replace-fail '@aider@' ${aider-chat}/bin/aider + substituteInPlace lua/helpers.lua --replace-fail '@aider@' ${aider-chat}/bin/aider ''; nvimRequireCheck = "aider"; }; @@ -2669,16 +2670,16 @@ in | grep -F 'version = "${version}"' cd vim-plugin - substituteInPlace ftplugin/nix.vim --replace statix ${statix}/bin/statix - substituteInPlace plugin/statix.vim --replace statix ${statix}/bin/statix + substituteInPlace ftplugin/nix.vim --replace-fail statix ${statix}/bin/statix + substituteInPlace plugin/statix.vim --replace-fail statix ${statix}/bin/statix ''; }; stylish-nvim = super.stylish-nvim.overrideAttrs { postPatch = '' - substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool - substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool - substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo + substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace-fail xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xorg.xwininfo}/bin/xwininfo ''; nvimRequireCheck = "stylish"; }; @@ -2943,7 +2944,7 @@ in postPatch = '' substituteInPlace lua/telescope/_extensions/zoxide/config.lua \ - --replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls" + --replace-fail "zoxide query -ls" "${zoxide}/bin/zoxide query -ls" ''; }; @@ -2982,7 +2983,7 @@ in patches = [ ./patches/tsc.nvim/fix-path.patch ]; postPatch = '' - substituteInPlace lua/tsc/utils.lua --replace '@tsc@' ${typescript}/bin/tsc + substituteInPlace lua/tsc/utils.lua --replace-fail '@tsc@' ${typescript}/bin/tsc ''; # Unit test @@ -3135,7 +3136,7 @@ in vim-agda = super.vim-agda.overrideAttrs { preFixup = '' substituteInPlace "$out"/autoload/agda.vim \ - --replace "jobstart(['agda'" "jobstart(['${agda}/bin/agda'" + --replace-fail "jobstart(['agda'" "jobstart(['${agda}/bin/agda'" ''; }; @@ -3179,7 +3180,7 @@ in vim-dasht = super.vim-dasht.overrideAttrs { preFixup = '' substituteInPlace $out/autoload/dasht.vim \ - --replace "['dasht']" "['${dasht}/bin/dasht']" + --replace-fail "['dasht']" "['${dasht}/bin/dasht']" ''; }; @@ -3280,7 +3281,7 @@ in vim-isort = super.vim-isort.overrideAttrs { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${python3.pkgs.isort}/${python3.sitePackages}")' + --replace-fail 'import vim' 'import vim; import sys; sys.path.append("${python3.pkgs.isort}/${python3.sitePackages}")' ''; }; @@ -3331,7 +3332,7 @@ in postPatch = old.postPatch or "" + '' - substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace-fail \ 'g:stylish_haskell_command = "stylish-haskell"' \ 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' ''; @@ -3363,10 +3364,10 @@ in buildInputs = [ python3 ]; patchPhase = '' substituteInPlace plugin/wakatime.vim \ - --replace 'autocmd BufEnter,VimEnter' \ - 'autocmd VimEnter' \ - --replace 'autocmd CursorMoved,CursorMovedI' \ - 'autocmd CursorMoved,CursorMovedI,BufEnter' + --replace-fail 'autocmd BufEnter,VimEnter' \ + 'autocmd VimEnter' \ + --replace-fail 'autocmd CursorMoved,CursorMovedI' \ + 'autocmd CursorMoved,CursorMovedI,BufEnter' ''; }; @@ -3377,7 +3378,7 @@ in vim-xkbswitch = super.vim-xkbswitch.overrideAttrs { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so + --replace-fail /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so ''; buildInputs = [ xkb-switch ]; }; @@ -3385,7 +3386,7 @@ in vim-yapf = super.vim-yapf.overrideAttrs { buildPhase = '' substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' + --replace-fail '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"' ''; }; @@ -3399,8 +3400,8 @@ in vimacs = super.vimacs.overrideAttrs { buildPhase = '' substituteInPlace bin/vim \ - --replace '/usr/bin/vim' 'vim' \ - --replace '/usr/bin/gvim' 'gvim' + --replace-fail '/usr/bin/vim' 'vim' \ + --replace-fail '/usr/bin/gvim' 'gvim' # remove unnecessary duplicated bin wrapper script rm -r plugin/vimacs ''; @@ -3436,11 +3437,12 @@ in vimproc-vim = super.vimproc-vim.overrideAttrs { buildInputs = [ which ]; + # TODO: revisit buildPhase = '' substituteInPlace autoload/vimproc.vim \ - --replace vimproc_mac.so vimproc_unix.so \ - --replace vimproc_linux64.so vimproc_unix.so \ - --replace vimproc_linux32.so vimproc_unix.so + --replace-fail vimproc_mac.so vimproc_unix.so \ + --replace-fail vimproc_linux64.so vimproc_unix.so \ + --replace-fail vimproc_linux32.so vimproc_unix.so make -f make_unix.mak ''; }; @@ -3509,7 +3511,7 @@ in YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" \ + --replace-fail "'ycm_path_to_python_interpreter', '''" \ "'ycm_path_to_python_interpreter', '${python3}/bin/python3'" rm -r third_party/ycmd @@ -3588,7 +3590,7 @@ in postPatch = '' substituteInPlace autoload/zoxide.vim \ - --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" + --replace-fail "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; From 497f030efb8cb02a9511a129289911bce576a467 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 12:54:14 -0600 Subject: [PATCH 4/7] vimPlugins: consolidate non generated plugins We dont want to keep polluting the plugins folder. Moving to a folder for non-generated plugins that only exist in overrides to be part of the package set. --- .../LanguageClient-neovim/default.nix | 0 .../avante-nvim/default.nix | 0 .../{ => non-generated}/blink-cmp/default.nix | 0 .../codesnap-nvim/default.nix | 0 .../{ => non-generated}/cord-nvim/default.nix | 0 .../moveline-nvim/Cargo.lock | 0 .../moveline-nvim/default.nix | 0 .../nvim-spectre/default.nix | 0 .../{ => non-generated}/sg-nvim/default.nix | 0 .../{ => non-generated}/sniprun/default.nix | 0 .../sniprun/fix-paths.patch | 0 .../{ => non-generated}/vim-clap/Cargo.lock | 0 .../{ => non-generated}/vim-clap/default.nix | 0 .../vim-markdown-composer/default.nix | 0 .../editors/vim/plugins/overrides.nix | 22 +++++++++---------- 15 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/LanguageClient-neovim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/avante-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/blink-cmp/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/codesnap-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/cord-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/moveline-nvim/Cargo.lock (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/moveline-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/nvim-spectre/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sg-nvim/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sniprun/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/sniprun/fix-paths.patch (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-clap/Cargo.lock (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-clap/default.nix (100%) rename pkgs/applications/editors/vim/plugins/{ => non-generated}/vim-markdown-composer/default.nix (100%) diff --git a/pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/avante-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/blink-cmp/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix diff --git a/pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/cord-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/Cargo.lock similarity index 100% rename from pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock rename to pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/Cargo.lock diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/moveline-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/nvim-spectre/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/sg-nvim/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/sniprun/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix diff --git a/pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch similarity index 100% rename from pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch rename to pkgs/applications/editors/vim/plugins/non-generated/sniprun/fix-paths.patch diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock rename to pkgs/applications/editors/vim/plugins/non-generated/vim-clap/Cargo.lock diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-clap/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/vim-clap/default.nix diff --git a/pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix similarity index 100% rename from pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 738d66459bdd..a166c7e2cecb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -173,7 +173,7 @@ in ]; }; - avante-nvim = callPackage ./avante-nvim { }; + avante-nvim = callPackage ./non-generated/avante-nvim { }; aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ @@ -244,7 +244,7 @@ in meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; - blink-cmp = callPackage ./blink-cmp { }; + blink-cmp = callPackage ./non-generated/blink-cmp { }; bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; @@ -654,7 +654,7 @@ in nvimRequireCheck = "codeium"; }; - codesnap-nvim = callPackage ./codesnap-nvim { }; + codesnap-nvim = callPackage ./non-generated/codesnap-nvim { }; codewindow-nvim = super.codewindow-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; @@ -764,7 +764,7 @@ in nvimRequireCheck = "coq"; }; - cord-nvim = callPackage ./cord-nvim { }; + cord-nvim = callPackage ./non-generated/cord-nvim { }; cornelis = super.cornelis.overrideAttrs { dependencies = [ self.vim-textobj-user ]; @@ -1272,7 +1272,7 @@ in nvimRequireCheck = "kulala"; }; - LanguageClient-neovim = callPackage ./LanguageClient-neovim { }; + LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { }; LazyVim = super.LazyVim.overrideAttrs { # Any other dependency is optional @@ -1599,7 +1599,7 @@ in ]; }; - moveline-nvim = callPackage ./moveline-nvim { }; + moveline-nvim = callPackage ./non-generated/moveline-nvim { }; multicursors-nvim = super.multicursors-nvim.overrideAttrs { dependencies = with self; [ @@ -2181,7 +2181,7 @@ in nvimSkipModule = "snippets.utils.cmp"; }; - nvim-spectre = callPackage ./nvim-spectre { }; + nvim-spectre = callPackage ./non-generated/nvim-spectre { }; nvim-surround = super.nvim-surround.overrideAttrs { # Optional treesitter integration @@ -2554,7 +2554,7 @@ in dependencies = [ self.nui-nvim ]; }; - sg-nvim = callPackage ./sg-nvim { }; + sg-nvim = callPackage ./non-generated/sg-nvim { }; skim = buildVimPlugin { pname = "skim"; @@ -2613,7 +2613,7 @@ in ]; }; - sniprun = callPackage ./sniprun { }; + sniprun = callPackage ./non-generated/sniprun { }; # The GitHub repository returns 404, which breaks the update script Spacegray-vim = buildVimPlugin { @@ -3152,7 +3152,7 @@ in passthru.python3Dependencies = ps: with ps; [ beancount ]; }; - vim-clap = callPackage ./vim-clap { }; + vim-clap = callPackage ./non-generated/vim-clap { }; vim-codefmt = super.vim-codefmt.overrideAttrs { dependencies = [ self.vim-maktaba ]; @@ -3285,7 +3285,7 @@ in ''; }; - vim-markdown-composer = callPackage ./vim-markdown-composer { }; + vim-markdown-composer = callPackage ./non-generated/vim-markdown-composer { }; vim-matchup = super.vim-matchup.overrideAttrs { # Optional treesitter integration From 2e1fcd24f900f842ae5fae5727a59204b9a5b533 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Dec 2024 23:20:04 -0600 Subject: [PATCH 5/7] vimPlugins.vim-wakatime: fix replace Changed in https://github.com/wakatime/vim-wakatime/commit/413e9c4e44baaeb60beded33e26c37d9d22130b0 but we missed because we weren't using replace fail. --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a166c7e2cecb..f593a72f87d6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3366,8 +3366,8 @@ in substituteInPlace plugin/wakatime.vim \ --replace-fail 'autocmd BufEnter,VimEnter' \ 'autocmd VimEnter' \ - --replace-fail 'autocmd CursorMoved,CursorMovedI' \ - 'autocmd CursorMoved,CursorMovedI,BufEnter' + --replace-fail 'autocmd CursorHold,CursorHoldI' \ + 'autocmd CursorHold,CursorHoldI,BufEnter' ''; }; From d8adc1e79a885abb4543eda789a3d3ec8283f701 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Dec 2024 23:25:11 -0600 Subject: [PATCH 6/7] vimPlugins.vim-xkbswitch: remove unused patch Changed to locate library in https://github.com/lyokha/vim-xkbswitch/commit/4aa9050c58b0b96a7bd28accd15d93fc410af725 instead of hardcoded. --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f593a72f87d6..624c0df23e50 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3376,10 +3376,6 @@ in }; vim-xkbswitch = super.vim-xkbswitch.overrideAttrs { - patchPhase = '' - substituteInPlace plugin/xkbswitch.vim \ - --replace-fail /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so - ''; buildInputs = [ xkb-switch ]; }; From 6653c164257d6b878758b77fc8bb51e9eaf29a0b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Dec 2024 23:55:58 -0600 Subject: [PATCH 7/7] vimPlugins.remote-nvim-nvim: dontPatchShebangs Brought up in https://github.com/nix-community/nixvim/issues/2669 --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 624c0df23e50..ebf03a88b777 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2491,6 +2491,7 @@ in }; remote-nvim-nvim = super.remote-nvim-nvim.overrideAttrs { + dontPatchShebangs = true; dependencies = with self; [ nui-nvim plenary-nvim