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

overlays/packages.nix

@@ -12,20 +12,6 @@ final: prev:
   timers = inputs.timers.packages.${prev.system}.default;
   hyprland = inputs.hyprland.packages.${prev.system}.default;
 
-  fzf1 = final.writeShellApplication {
-    name = "fzf1";
-    runtimeInputs = with final; [ coreutils fzf fd ];
-    text = ''
-      #!/usr/bin/env bash
-      selected=$(fzf --query="$*" -1 < /dev/stdin)
-
-      if [[ -z $selected ]]; then
-        exit 0
-      fi
-
-      echo "$selected"
-    '';
-  };
   xorg = prev.xorg // {
     lndir = prev.xorg.lndir.overrideAttrs (_: {
       meta.mainProgram = "lndir";

overlays/vimPlugins.nix

@@ -4,6 +4,8 @@ _: prev:
 with lib.my;
 {
   vimPlugins = prev.vimPlugins // {
+    inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim;
+
     smartcolumn-nvim = prev.vimUtils.buildVimPlugin {
       pname = "smartcolumn-nvim";
       version = mkVersionInput inputs.smartcolumn-nvim;
@@ -49,5 +51,10 @@ with lib.my;
       version = mkVersionInput inputs.nvim-puppeteer;
       src = inputs.nvim-puppeteer;
     };
+
+    null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: {
+      version = mkVersionInput inputs.none-ls-nvim;
+      src = inputs.none-ls-nvim;
+    });
   };
 }