fish: Use 4.0b1

NixOS/nixpkgs#367229
Lillecarl · Dec 29, 2024 · bc3ac40 · bc3ac40
1 parent 1d8edd0
commit bc3ac40
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,6 +2,7 @@
   inputs = {
     # Direct inputs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-fish.url = "github:NixOS/nixpkgs/fish";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";

diff --git a/users/lillecarl/terminal/fish.nix b/users/lillecarl/terminal/fish.nix
@@ -23,6 +23,7 @@ in
 
     programs.fish = {
       enable = true;
+      package = config.lib.pspkgs.fish4;
 
       generateCompletions = config.ps.terminal.mode == "fat";
 

diff --git a/users/lillecarl/terminal/noshell.nix b/users/lillecarl/terminal/noshell.nix
@@ -18,6 +18,6 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
-    xdg.configFile."shell".source = lib.getExe pkgs.fish;
+    xdg.configFile."shell".source = lib.getExe config.programs.fish.package;
   };
 }
diff --git a/users/lillecarl/terminal/packages.nix b/users/lillecarl/terminal/packages.nix
@@ -140,5 +140,8 @@
         '';
       })
     );
+    lib.pspkgs.fish4 = (
+      pkgs.callPackage "${inputs.nixpkgs-fish}/pkgs/shells/fish" {}
+    );
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,5 +140,8 @@ @@
             '';
           })
         );
+        lib.pspkgs.fish4 = (
+          pkgs.callPackage "${inputs.nixpkgs-fish}/pkgs/shells/fish" {}
+        );
       };
     }