Merge remote-tracking branch 'origin/nixos' into nixos

overlays/channels.nix

@@ -1,6 +1,6 @@
-{ lib, inputs }:
+{ inputs, ... }:
 
-final: prev: {
+_: prev: {
   master = import inputs.master {
     inherit (prev) system;
     config.allowUnfree = true;

overlays/lib.nix

@@ -1,5 +1,5 @@
-{ lib, inputs }:
+{ lib, ... }:
 
-final: prev: {
+_: _: {
   inherit lib;
 }

overlays/packages.nix

@@ -1,10 +1,9 @@
-{ inputs, lib }:
+{ inputs, ... }:
 
-final: prev:
+_: prev:
 {
   agenix = inputs.agenix.packages.${prev.system}.default;
   attic = inputs.attic.packages.${prev.system}.default;
   hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
-  neovim-nightly = inputs.neovim.packages.${prev.system}.default;
   nil = inputs.nil.packages.${prev.system}.default;
 }

overlays/vimPlugins.nix

@@ -1,6 +1,6 @@
 { inputs, lib }:
 
-final: prev:
+_: prev:
 with lib.my;
 {
   vimPlugins = prev.vimPlugins // {
@@ -16,26 +16,37 @@ with lib.my;
       src = inputs.smartcolumn-nvim;
     };
 
-    copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: {
+    copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (_: {
       version = mkVersionInput inputs.copilot-lua;
       src = inputs.copilot-lua;
     });
 
-    lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (old: {
+    lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (_: {
       version = mkVersionInput inputs.lspsaga-nvim;
       src = inputs.lspsaga-nvim;
     });
 
-    advanced-git-search-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
-      pname = "advanced-git-search-nvim";
-      version = mkVersionInput inputs.advanced-git-search-nvim;
-      src = inputs.advanced-git-search-nvim;
-    };
-
     cmp-async-path = prev.vimPlugins.cmp-path.overrideAttrs (old: {
       pname = "cmp-async-path";
       version = mkVersionInput inputs.cmp-async-path;
       src = inputs.cmp-async-path;
     });
+
+    comment-box-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
+      pname = "comment-box-nvim";
+      version = mkVersionInput inputs.comment-box-nvim;
+      src = inputs.comment-box-nvim;
+    };
+
+    gitignore-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
+      pname = "gitignore-nvim";
+      version = mkVersionInput inputs.gitignore-nvim;
+      src = inputs.gitignore-nvim;
+    };
+
+    bufferline-nvim = prev.vimPlugins.bufferline-nvim.overrideAttrs (_: {
+      version = mkVersionInput inputs.bufferline-nvim;
+      src = inputs.bufferline-nvim;
+    });
   };
 }

overlays/wayland.nix

@@ -1,4 +1,4 @@
-{ lib, inputs }:
+_:
 
 final: prev: {
   neovide-hyprland = final.symlinkJoin {