nvim: switch many plugins to nixpkgs src

home/programs/nvim/default.nix

@@ -17,7 +17,7 @@ in
     withRuby = false;
     withPython3 = false;
 
-    extraLuaPackages = luaPkgs: with luaPkgs; [ jsregexp lua-toml readline ];
+    extraLuaPackages = luaPkgs: with luaPkgs; [ lua-toml readline ];
 
     extraPackages = with pkgs; [
       stdenv.cc
@@ -80,10 +80,9 @@ in
       in
       with customPlugins; [
         # Utils
-        popup-nvim
-        plenary-nvim
-
-        nvim-web-devicons
+        vimPlugins.popup-nvim
+        vimPlugins.plenary-nvim
+        vimPlugins.nvim-web-devicons
 
         {
           plugin = vimPlugins.wezterm-nvim;
@@ -91,11 +90,11 @@ in
           type = "fennel";
         }
 
-        vim-cool
+        vimPlugins.vim-cool
 
         # Keybindings
         {
-          plugin = yanky-nvim;
+          plugin = vimPlugins.yanky-nvim;
           config = builtins.readFile ../../config/nvim/plugins/yanky.fnl;
           type = "fennel";
         }
@@ -107,7 +106,7 @@ in
         }
 
         {
-          plugin = substitute-nvim;
+          plugin = vimPlugins.substitute-nvim;
           config = builtins.readFile ../../config/nvim/plugins/substitute.fnl;
           type = "fennel";
         }
@@ -138,7 +137,7 @@ in
 
         # Finder
         {
-          plugin = fzf-lua;
+          plugin = vimPlugins.fzf-lua;
           config = builtins.readFile ../../config/nvim/plugins/fzf.fnl;
           type = "fennel";
         }
@@ -150,27 +149,27 @@ in
           type = "fennel";
         }
 
-        nvim-jdtls
+        vimPlugins.nvim-jdtls
 
-        schemastore-nvim
+        vimPlugins.SchemaStore-nvim
 
-        lspkind-nvim
+        vimPlugins.lspkind-nvim
 
         {
-          plugin = nvim-navic;
+          plugin = vimPlugins.nvim-navic;
           config = builtins.readFile ../../config/nvim/plugins/navic.fnl;
           type = "fennel";
         }
 
         {
-          plugin = vim-illuminate;
+          plugin = vimPlugins.vim-illuminate;
           config = builtins.readFile ../../config/nvim/plugins/illuminate.fnl;
           type = "fennel";
         }
 
         # Linter
         {
-          plugin = nvim-lint;
+          plugin = vimPlugins.nvim-lint;
           config = builtins.readFile ../../config/nvim/plugins/nvim-lint.fnl;
           type = "fennel";
         }
@@ -184,7 +183,7 @@ in
 
         # Snippets
         {
-          plugin = LuaSnip;
+          plugin = vimPlugins.luasnip;
           config = builtins.readFile ../../config/nvim/plugins/luasnip.fnl;
           type = "fennel";
         }
@@ -201,7 +200,7 @@ in
         # Formatting
 
         {
-          plugin = conform-nvim;
+          plugin = vimPlugins.conform-nvim;
           config = builtins.readFile ../../config/nvim/plugins/formatter.fnl;
           type = "fennel";
         }
@@ -217,14 +216,14 @@ in
         nvim-treesitter-textobjects
 
         {
-          plugin = nvim-surround;
+          plugin = vimPlugins.nvim-surround;
           config = builtins.readFile ../../config/nvim/plugins/surround.fnl;
           type = "fennel";
         }
 
         # UI
         {
-          plugin = oil-nvim;
+          plugin = vimPlugins.oil-nvim;
           config = /* fennel */ ''
             (let [oil (require :oil)]
               (oil.setup))
@@ -233,19 +232,19 @@ in
         }
 
         {
-          plugin = heirline-nvim;
+          plugin = vimPlugins.heirline-nvim;
           config = builtins.readFile ../../config/nvim/plugins/heirline.fnl;
           type = "fennel";
         }
 
         {
-          plugin = indent-blankline-nvim;
+          plugin = vimPlugins.indent-blankline-nvim;
           config = builtins.readFile ../../config/nvim/plugins/indent_line.fnl;
           type = "fennel";
         }
 
         {
-          plugin = virt-column-nvim;
+          plugin = vimPlugins.virt-column-nvim;
           config = /* fennel */ ''
             (let [virt-column (require :virt-column)]
               (virt-column.setup))
@@ -254,31 +253,31 @@ in
         }
 
         {
-          plugin = urlview-nvim;
+          plugin = vimPlugins.urlview-nvim;
           config = builtins.readFile ../../config/nvim/plugins/urlview.fnl;
           type = "fennel";
         }
 
         {
-          plugin = hover-nvim;
+          plugin = vimPlugins.hover-nvim;
           config = builtins.readFile ../../config/nvim/plugins/hover.fnl;
           type = "fennel";
         }
 
         # {
-        #   plugin = gitsigns-nvim;
+        #   plugin = vimPlugins.gitsigns-nvim;
         #   config = builtins.readFile ../../config/nvim/plugins/gitsigns.fnl;
         #   type = "fennel";
         # }
 
         {
-          plugin = diffview-nvim;
+          plugin = vimPlugins.diffview-nvim;
           config = builtins.readFile ../../config/nvim/plugins/diffview.fnl;
           type = "fennel";
         }
 
         {
-          plugin = neogit;
+          plugin = vimPlugins.neogit;
           config = builtins.readFile ../../config/nvim/plugins/neogit.fnl;
           type = "fennel";
         }
@@ -290,13 +289,13 @@ in
         }
 
         {
-          plugin = which-key-nvim;
+          plugin = vimPlugins.which-key-nvim;
           config = builtins.readFile ../../config/nvim/plugins/which-key.fnl;
           type = "fennel";
         }
       ] ++ optionals isDarwin [
         {
-          plugin = pkgs.vimPlugins.cmp-tabnine;
+          plugin = vimPlugins.cmp-tabnine;
           config = builtins.readFile ../../config/nvim/plugins/cmp_tabnine.fnl;
           type = "fennel";
         }

home/programs/nvim/plugins.nix

@@ -2,80 +2,9 @@
 { pkgs, ... }:
 let
   inherit (pkgs) fetchFromGitHub;
-  inherit (pkgs) fetchFromGitea;
   inherit (pkgs.vimUtils) buildVimPlugin;
 in
 {
-  popup-nvim = buildVimPlugin {
-    pname = "popup.nvim";
-    version = "2021-11-18";
-    src = fetchFromGitHub {
-      owner = "nvim-lua";
-      repo = "popup.nvim";
-      rev = "b7404d35d5d3548a82149238289fa71f7f6de4ac";
-      sha256 = "093r3cy02gfp7sphrag59n3fjhns7xdsam1ngiwhwlig3bzv7mbl";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  plenary-nvim = buildVimPlugin {
-    pname = "plenary.nvim";
-    version = "2024-09-17";
-    src = fetchFromGitHub {
-      owner = "nvim-lua";
-      repo = "plenary.nvim";
-      rev = "2d9b06177a975543726ce5c73fca176cedbffe9d";
-      sha256 = "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  nvim-web-devicons = buildVimPlugin {
-    pname = "nvim-web-devicons";
-    version = "2024-12-26";
-    src = fetchFromGitHub {
-      owner = "kyazdani42";
-      repo = "nvim-web-devicons";
-      rev = "63f552a7f59badc6e6b6d22e603150f0d5abebb7";
-      sha256 = "04yr85zz9b04lgxl9gfda52l0p82a1lc891s921mll3bx48i1xb2";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  vim-cool = buildVimPlugin {
-    pname = "vim-cool";
-    version = "2023-09-06";
-    src = fetchFromGitHub {
-      owner = "romainl";
-      repo = "vim-cool";
-      rev = "662e7b11064cbeedad17c45d2fe926e78d3cd0b6";
-      sha256 = "1ilddllx5riyzw4dx05rnvcxgngg7y2iydnkjn01wlddmid65p9k";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  yanky-nvim = buildVimPlugin {
-    pname = "yanky.nvim";
-    version = "2024-11-13";
-    src = fetchFromGitHub {
-      owner = "gbprod";
-      repo = "yanky.nvim";
-      rev = "f9b905994cccf3c55f41af3a0a1f4c76c844e411";
-      sha256 = "1dvsl6wd6m4gygn32rcmz95hzklknwp4s3s9iyp0ac48q8z8kp73";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
   cutlass-nvim = buildVimPlugin {
     pname = "cutlass.nvim";
     version = "2023-12-18";
@@ -90,20 +19,6 @@ in
     doCheck = false;
     doInstallCheck = false;
   };
-  substitute-nvim = buildVimPlugin {
-    pname = "substitute.nvim";
-    version = "2024-07-06";
-    src = fetchFromGitHub {
-      owner = "gbprod";
-      repo = "substitute.nvim";
-      rev = "97f49d16f8eea7967d41db4f657dd63af53eeba1";
-      sha256 = "017g2y3hmwa5ar778djr86x9v2nc9lg84njx82rajs6lx28a8m94";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
   move-nvim = buildVimPlugin {
     pname = "move.nvim";
     version = "2023-10-25";
@@ -134,26 +49,12 @@ in
   };
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2024-12-26";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "17678b00fa5c2712890a0ec2e269d0a4de1207df";
-      sha256 = "0d6fw1205bhlaxi0kzbl9gn4vgnyca2qxbnch21hz2mbm2wlq8qm";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  fzf-lua = buildVimPlugin {
-    pname = "fzf-lua";
-    version = "2024-12-26";
-    src = fetchFromGitHub {
-      owner = "ibhagwan";
-      repo = "fzf-lua";
-      rev = "76e25abc4bbaab243b52fad7f7d4262e76254fd3";
-      sha256 = "0prii8hv8jli4p69mjqjma650q906f187i6zvk2g9i4kdvzzqpj6";
+      rev = "eb3e850acff4d9f2f2dd8dacd75353043c899753";
+      sha256 = "0zmhrhdqj07r2xjsjd0xq114y3cn8zpdscvgviy4k4gx7iv3ir72";
       fetchSubmodules = false;
 
     };
@@ -174,90 +75,6 @@ in
     doCheck = false;
     doInstallCheck = false;
   };
-  nvim-jdtls = buildVimPlugin {
-    pname = "nvim-jdtls";
-    version = "2024-11-26";
-    src = fetchFromGitHub {
-      owner = "mfussenegger";
-      repo = "nvim-jdtls";
-      rev = "ece818f909c6414cbad4e1fb240d87e003e10fda";
-      sha256 = "0w8v835diycphiq5rd9pw43sjsyqj0fbfw9njw11i0967ls0ap0b";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  schemastore-nvim = buildVimPlugin {
-    pname = "schemastore.nvim";
-    version = "2024-12-23";
-    src = fetchFromGitHub {
-      owner = "b0o";
-      repo = "schemastore.nvim";
-      rev = "545d8814f624fb5239c4691fa0914549540e6f53";
-      sha256 = "0b25wc37c3biji0mvwwh1s0mlk1i09ajjfhr2f9sjs0l04v6mcyc";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  lspkind-nvim = buildVimPlugin {
-    pname = "lspkind.nvim";
-    version = "2024-12-05";
-    src = fetchFromGitHub {
-      owner = "onsails";
-      repo = "lspkind.nvim";
-      rev = "d79a1c3299ad0ef94e255d045bed9fa26025dab6";
-      sha256 = "1wdavqmwadby9lyw415jw79kxynxv4fxg2v376y0rkxf258clarq";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  nvim-navic = buildVimPlugin {
-    pname = "nvim-navic";
-    version = "2023-11-30";
-    src = fetchFromGitHub {
-      owner = "SmiteshP";
-      repo = "nvim-navic";
-      rev = "8649f694d3e76ee10c19255dece6411c29206a54";
-      sha256 = "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  vim-illuminate = buildVimPlugin {
-    pname = "vim-illuminate";
-    version = "2024-05-17";
-    src = fetchFromGitHub {
-      owner = "RRethy";
-      repo = "vim-illuminate";
-      rev = "5eeb7951fc630682c322e88a9bbdae5c224ff0aa";
-      sha256 = "0g86iv1mndcalrizdhl3z8ryj19jnqv139jwijpzyfk8gi677lhd";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  nvim-lint = buildVimPlugin {
-    pname = "nvim-lint";
-    version = "2024-12-19";
-    src = fetchFromGitHub {
-      owner = "mfussenegger";
-      repo = "nvim-lint";
-      rev = "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55";
-      sha256 = "11khnhy2srlq02x3xb7c33k8rbinj8s6c9k2r8m8f70xfn45qgdl";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
   ts-comments-nvim = buildVimPlugin {
     pname = "ts-comments.nvim";
     version = "2024-12-14";
@@ -272,34 +89,6 @@ in
     doCheck = false;
     doInstallCheck = false;
   };
-  LuaSnip = buildVimPlugin {
-    pname = "LuaSnip";
-    version = "2024-12-02";
-    src = fetchFromGitHub {
-      owner = "L3MON4D3";
-      repo = "LuaSnip";
-      rev = "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d";
-      sha256 = "1zicjd8y9a16rq1rs1xbmc6g927j5xi05yrxj9ap6wp72pfxxw3r";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  conform-nvim = buildVimPlugin {
-    pname = "conform.nvim";
-    version = "2024-12-25";
-    src = fetchFromGitHub {
-      owner = "stevearc";
-      repo = "conform.nvim";
-      rev = "9180320205d250429f0f80e073326c674e2a7149";
-      sha256 = "128dby40rlzm6sy9ga0xbb9534rla1nc8k4apjsb8kyir40bgbi7";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
     version = "2024-11-17";
@@ -328,146 +117,6 @@ in
     doCheck = false;
     doInstallCheck = false;
   };
-  nvim-surround = buildVimPlugin {
-    pname = "nvim-surround";
-    version = "2024-11-28";
-    src = fetchFromGitHub {
-      owner = "kylechui";
-      repo = "nvim-surround";
-      rev = "9f0cb495f25bff32c936062d85046fbda0c43517";
-      sha256 = "1c78320liqhza52gq2xylykd9m6rl50cn44flldg43a4l7rrabxh";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  oil-nvim = buildVimPlugin {
-    pname = "oil.nvim";
-    version = "2024-12-21";
-    src = fetchFromGitHub {
-      owner = "stevearc";
-      repo = "oil.nvim";
-      rev = "ba858b662599eab8ef1cba9ab745afded99cb180";
-      sha256 = "1pk6863f79278mrw1zdshbalsih245ynkp4z54znza238a57x87n";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  heirline-nvim = buildVimPlugin {
-    pname = "heirline.nvim";
-    version = "2024-11-14";
-    src = fetchFromGitHub {
-      owner = "rebelot";
-      repo = "heirline.nvim";
-      rev = "cc359b628266cb9a84b2d71c883f2b99e16473a0";
-      sha256 = "0gymrk7jjf6pi3nalyckcdyq28z8fkhi4a6wmqm3wqm2by1q5r4v";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  indent-blankline-nvim = buildVimPlugin {
-    pname = "indent-blankline.nvim";
-    version = "2024-12-04";
-    src = fetchFromGitHub {
-      owner = "lukas-reineke";
-      repo = "indent-blankline.nvim";
-      rev = "259357fa4097e232730341fa60988087d189193a";
-      sha256 = "1q9fgqvr84lynhy2vcyzp9xhzrl80g2pin14v7d3v0pgj10m8y8z";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  virt-column-nvim = buildVimPlugin {
-    pname = "virt-column.nvim";
-    version = "2024-11-12";
-    src = fetchFromGitHub {
-      owner = "lukas-reineke";
-      repo = "virt-column.nvim";
-      rev = "b87e3e0864211a32724a2ebf3be37e24e9e2fa99";
-      sha256 = "0mlygwrsf6pc44jscq1nb17a8f7p1jv2hgg7ibrm08hqgv7y6fm3";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  urlview-nvim = buildVimPlugin {
-    pname = "urlview.nvim";
-    version = "2024-06-04";
-    src = fetchFromGitHub {
-      owner = "axieax";
-      repo = "urlview.nvim";
-      rev = "c07733179e27c225ac3c58c3951701ee10b2dbde";
-      sha256 = "1qbqn9h7602dw8vgj5m1i45g679n8j82h38hl0ab9lhxxykf2cys";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  hover-nvim = buildVimPlugin {
-    pname = "hover.nvim";
-    version = "2024-12-11";
-    src = fetchFromGitHub {
-      owner = "lewis6991";
-      repo = "hover.nvim";
-      rev = "140c4d0ae9397b76baa46b87c574f5377de09309";
-      sha256 = "0z1ff8awna7pk13k56xc4vsdwcn3rbsr5j80p8aq1nkm521j5q5p";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  gitsigns-nvim = buildVimPlugin {
-    pname = "gitsigns.nvim";
-    version = "2024-11-23";
-    src = fetchFromGitHub {
-      owner = "lewis6991";
-      repo = "gitsigns.nvim";
-      rev = "5f808b5e4fef30bd8aca1b803b4e555da07fc412";
-      sha256 = "1dxsyv26mm7lzll3xlkzjj6w7kp11wfak8rgp19fg2d8301kxc0z";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  diffview-nvim = buildVimPlugin {
-    pname = "diffview.nvim";
-    version = "2024-06-13";
-    src = fetchFromGitHub {
-      owner = "sindrets";
-      repo = "diffview.nvim";
-      rev = "4516612fe98ff56ae0415a259ff6361a89419b0a";
-      sha256 = "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
-  neogit = buildVimPlugin {
-    pname = "neogit";
-    version = "2024-12-24";
-    src = fetchFromGitHub {
-      owner = "NeogitOrg";
-      repo = "neogit";
-      rev = "9ea60f79e370d8f4847efc145e53afe4b0613fc1";
-      sha256 = "11rk1mjb8sx5b43qrbpy3qmmxsdk1rs2agxzrpidvnxvrqwjzmh4";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
   fidget-nvim = buildVimPlugin {
     pname = "fidget.nvim";
     version = "2024-12-16";
@@ -482,18 +131,4 @@ in
     doCheck = false;
     doInstallCheck = false;
   };
-  which-key-nvim = buildVimPlugin {
-    pname = "which-key.nvim";
-    version = "2024-12-15";
-    src = fetchFromGitHub {
-      owner = "folke";
-      repo = "which-key.nvim";
-      rev = "8ab96b38a2530eacba5be717f52e04601eb59326";
-      sha256 = "12wkl04apgag0p5njw8mczzlbxqf5h08k61qciwy10n4q1harzvz";
-      fetchSubmodules = false;
-
-    };
-    doCheck = false;
-    doInstallCheck = false;
-  };
 }

home/programs/nvim/plugins.yaml

@@ -1,49 +1,17 @@
-# Utils
-- src: nvim-lua/popup.nvim
-- src: nvim-lua/plenary.nvim
-- src: kyazdani42/nvim-web-devicons
-- src: romainl/vim-cool
 # Keybindings
-- src: gbprod/yanky.nvim
 - src: gbprod/cutlass.nvim
-- src: gbprod/substitute.nvim
 - src: hinell/move.nvim
 # Themes
 - src: Mofiqul/dracula.nvim
 # Syntax
 - src: nvim-treesitter/nvim-treesitter
-# Finder
-- src: ibhagwan/fzf-lua
 # LSP
 - src: neovim/nvim-lspconfig
-- src: mfussenegger/nvim-jdtls
-- src: b0o/schemastore.nvim
-- src: onsails/lspkind.nvim
-- src: SmiteshP/nvim-navic
-- src: RRethy/vim-illuminate
-# Linter
-- src: mfussenegger/nvim-lint
 # Comments
 - src: folke/ts-comments.nvim
-# Snippets
-- src: L3MON4D3/LuaSnip
-# Formatting
-- src: stevearc/conform.nvim
 # Pairs
 - src: windwp/nvim-autopairs
 # Textobjects
 - src: nvim-treesitter/nvim-treesitter-textobjects
-- src: kylechui/nvim-surround
 # UI
-- src: stevearc/oil.nvim
-- src: rebelot/heirline.nvim
-- src: lukas-reineke/indent-blankline.nvim
-- src: lukas-reineke/virt-column.nvim
-- src: axieax/urlview.nvim
-- src: lewis6991/hover.nvim
-- src: lewis6991/gitsigns.nvim
-- src: sindrets/diffview.nvim
-- src: NeogitOrg/neogit
-  branch: master
 - src: j-hui/fidget.nvim
-- src: folke/which-key.nvim

home/programs/nvim/update-plugins.sh

@@ -23,7 +23,7 @@ rm -f "$nix_new_file"
   echo 'let'
   echo 'inherit (pkgs) fetchFromGitHub;'
   # echo 'inherit (pkgs) fetchFromSourcehut;'
-  echo 'inherit (pkgs) fetchFromGitea;'
+  # echo 'inherit (pkgs) fetchFromGitea;'
   echo 'inherit (pkgs.vimUtils) buildVimPlugin;'
   echo 'in'
   echo '{'