fix unified config

This commit is contained in:
Simon Gardling 2025-04-07 21:34:13 -04:00
parent 635b3d4271
commit 8b95e6e0a0
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 22 additions and 22 deletions

View File

@ -66,21 +66,21 @@
"yarn" "yarn"
]; ];
inputs.nixpkgs = # pkgs =
(import nixpkgs { # (import nixpkgs {
}).applyPatches # }).applyPatches
{ # {
name = "nixpkgs"; # name = "nixpkgs";
src = inputs.nixpkgs; # src = inputs.nixpkgs;
patches = [ # patches = [
# https://github.com/NixOS/nixpkgs/pull/67576 # # https://github.com/NixOS/nixpkgs/pull/67576
# gimp 3.0 # # gimp 3.0
(builtins.fetchurl { # (builtins.fetchurl {
url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; # url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; # sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia";
}) # })
]; # ];
}; # };
in in
{ {
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
@ -97,7 +97,13 @@
( (
{ ... }: { ... }:
{ {
home-manager = import ./home-manager/home-${hostname}.nix { inherit inputs hostname username; }; # home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
inherit inputs hostname username;
homeDirectory = "/home/${username}";
};
home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
} }
) )
./etcnixos/system-${hostname}.nix ./etcnixos/system-${hostname}.nix

View File

@ -56,12 +56,6 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
]; ];
# home-manager stuff
home = {
inherit username;
homeDirectory = "/home/${username}";
};
} }
) )
]; ];