This commit is contained in:
CherryKitten 2024-03-24 19:03:25 +01:00
parent f37af0088b
commit 53ac199cfe
Signed by: sammy
GPG key ID: 98D8F75FB0658276
4 changed files with 4 additions and 4 deletions

View file

@ -73,7 +73,7 @@
mkHome = { user ? "sammy", hostname ? null }: mkHome = { user ? "sammy", hostname ? null }:
lib.homeManagerConfiguration { lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ ./modules/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix; modules = [ ./modules/home/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; }; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };

View file

@ -1,5 +1,5 @@
{ ... }: { { ... }: {
imports = [ ../home ]; imports = [ ../default.nix ];
programs.git = { programs.git = {
userName = "CherryKitten"; userName = "CherryKitten";

View file

@ -9,7 +9,7 @@
imports = [ imports = [
./graphical.nix ./graphical.nix
./security.nix ./security.nix
../users ./users.nix
./yubikey.nix ./yubikey.nix
./virtualization.nix ./virtualization.nix
]; ];

View file

@ -16,6 +16,6 @@ in
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZyQSZw+pExsx2RXB+yxbaJGB9mtvudbQ/BP7E1yKvr openpgp:0x6068FEBB" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZyQSZw+pExsx2RXB+yxbaJGB9mtvudbQ/BP7E1yKvr openpgp:0x6068FEBB" ];
}; };
home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ./sammy.nix); home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ../home/users/sammy.nix);
}; };
} }