This commit is contained in:
2023-07-05 00:40:34 +02:00
parent 809e0d5b75
commit 61ea6fc08c
6 changed files with 17 additions and 10 deletions
+7 -7
View File
@@ -85,7 +85,7 @@
modules = modules ++ [ ./base.nix "${self}/hosts/${hostname}" tmpConfig ({
home-manager.extraSpecialArgs = {
inherit inputs;
packages = self.packages.${system};
flakes = flake inputs system;
};
# still needed even if using networkd
networking.hostName = hostname;
@@ -100,12 +100,12 @@
# This makes commandline tools like 'nix run nixpkgs#hello'
# and 'nix-shell -p hello' use the same channel as system was built with
nix.registry.nixpkgs.flake = inputs.nixpkgs;
#nix.registry.nixpkgs-unstable.flake = inputs.unstable;
nix.registry.nixpkgs-unstable.flake = "github:NixOS/nixpkgs/nixos-unstable";
nix.registry.nixpkgs-unstable.flake = inputs.unstable;
#nix.registry.nixpkgs-unstable.flake.url = "github:NixOS/nixpkgs/nixos-unstable";
nix.nixPath = [
"nixpkgs=${inputs.nixpkgs}"
#"nixpkgs-unstable=${inputs.unstable}"
"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-unstable"
"nixpkgs-unstable=${inputs.unstable}"
#"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-unstable"
];
})];
};
@@ -133,14 +133,14 @@
sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]);
};
homeConfigurations = forAllSystems ({ pkgs, system, ... }: let
homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let
mkHome = user: home: modules: home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = modules ++ [{
home.username = user;
home.homeDirectory = home;
}];
extraSpecialArgs.packages = self.packages.${system};
extraSpecialArgs.flakes = flakes;
};
in {
pbsds = mkHome "pbsds" "/home/pbsds" [ ./users/pbsds/home ];