Fix fish nix function recurse error

This commit is contained in:
2026-07-08 08:15:50 +01:00
parent 32b5474307
commit 3aa23d4ce1
4 changed files with 80 additions and 6 deletions
Generated
+53 -1
View File
@@ -71,11 +71,63 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1743095683,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"kutu": "kutu", "kutu": "kutu",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"spicetify-nix": "spicetify-nix"
}
},
"spicetify-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"systems": "systems"
},
"locked": {
"lastModified": 1743595372,
"narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"ref": "24.11",
"repo": "spicetify-nix",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
} }
} }
}, },
+8 -2
View File
@@ -1,15 +1,18 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
kutu.url = "git+https://git.syedm.dev/syedm/kutu.rb.git"; kutu.url = "git+https://git.syedm.dev/syedm/kutu.rb.git";
spicetify-nix.url = "github:Gerg-L/spicetify-nix/24.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = inputs@{ nixpkgs, kutu, home-manager, ... }: outputs = inputs@{ nixpkgs, kutu, home-manager, spicetify-nix, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
@@ -32,7 +35,10 @@
./hosts/common.nix ./hosts/common.nix
./hosts/tardis ./hosts/tardis
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ home-manager.users.me = import ./home; } {
home-manager.users.me = import ./home;
home-manager.extraSpecialArgs = { inherit inputs; };
}
]; ];
}; };
}; };
+17 -1
View File
@@ -1,7 +1,11 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
in
{ {
imports = [ imports = [
inputs.spicetify-nix.homeManagerModules.spicetify
./battery ./battery
./btop ./btop
./dunst ./dunst
@@ -17,6 +21,8 @@
./yazi ./yazi
]; ];
nixpkgs.config.allowUnfree = true;
home.username = "me"; home.username = "me";
home.homeDirectory = "/home/me"; home.homeDirectory = "/home/me";
@@ -47,5 +53,15 @@
fi fi
''; '';
programs.spicetify = {
enable = true;
enabledExtensions = with spicePkgs.extensions; [
adblockify
hidePodcasts
];
theme = spicePkgs.themes.catppuccin;
colorScheme = "mocha";
};
home.stateVersion = "26.05"; home.stateVersion = "26.05";
} }
+2 -2
View File
@@ -2,11 +2,11 @@ set -gx fish_greeting
function nix function nix
if test "$argv[1]" = "develop" if test "$argv[1]" = "develop"
nix develop -c fish $argv[2..-1] command nix develop -c fish $argv[2..-1]
else if test "$argv[1]" = "shell" else if test "$argv[1]" = "shell"
env IN_NIX_SHELL=shell nix $argv env IN_NIX_SHELL=shell nix $argv
else else
nix $argv command nix $argv
end end
end end
function a function a