diff --git a/flake.nix b/flake.nix index 5aa6c30..eccaf0f 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,25 @@ kernel = (aarch64Pkgs.callPackage ./pkgs/linux { }).testing-rockchip; + userModule = ({ config, ... }: { + sops = { + defaultSopsFile = ./secrets/asonix.yaml; + age.keyFile = /home/asonix/.config/sops/age/keys.txt; + age.generateKey = true; + secrets.password.neededForUsers = true; + }; + + users.users.asonix = { + isNormalUser = true; + description = "Tavi"; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3+mNUlokSKZQNXJAuGm2LCHelKuElWLJArzIYZQYEPbrFaE+J8VtfNbMMD1qVI21ksfcqvFQW4aiP4+BFDxTOGW0uBmUHWKxkyyU39y2yhnsa+svwwIooc+Iwkxw0atzSMEBb94UaZlq9cKMSnG9RGeRFqfYnW2s49wpU79wk6zEFUuOHCMKn4R7zqkPac7IyjxZeKlspY3fOasNH4zyrkbhEOlvrwEOdRNTRNCWWzDcinIVZjfmErHlSynshx9yLnCGkLBxHSxgI2TVyR3RlQ3aGbHtB3QN5X7/T/dwXJFJ11P1Q2bC3XP3hHCogDqXcPvDTFSQEM/mZuFcKNbsn asonix@asonix-tower" + ]; + passwordFile = config.sops.secrets.password.path; + }; + }); + system = aarch64Pkgs.callPackage ./pkgs/system { inherit nixpkgs; inherit kernel; @@ -42,24 +61,7 @@ extraModules = [ sops-nix.nixosModules.sops - ({ config, ... }: { - sops = { - defaultSopsFile = ./secrets/asonix.yaml; - age.keyFile = /home/asonix/.config/sops/age/keys.txt; - age.generateKey = true; - secrets.password.neededForUsers = true; - }; - - users.users.asonix = { - isNormalUser = true; - description = "Tavi"; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3+mNUlokSKZQNXJAuGm2LCHelKuElWLJArzIYZQYEPbrFaE+J8VtfNbMMD1qVI21ksfcqvFQW4aiP4+BFDxTOGW0uBmUHWKxkyyU39y2yhnsa+svwwIooc+Iwkxw0atzSMEBb94UaZlq9cKMSnG9RGeRFqfYnW2s49wpU79wk6zEFUuOHCMKn4R7zqkPac7IyjxZeKlspY3fOasNH4zyrkbhEOlvrwEOdRNTRNCWWzDcinIVZjfmErHlSynshx9yLnCGkLBxHSxgI2TVyR3RlQ3aGbHtB3QN5X7/T/dwXJFJ11P1Q2bC3XP3hHCogDqXcPvDTFSQEM/mZuFcKNbsn asonix@asonix-tower" - ]; - passwordFile = config.sops.secrets.password.path; - }; - }) + userModule ]; }; @@ -71,7 +73,7 @@ testing-rockchip = kernel; }; - modules = system.modules; + modules = system.modules // { inherit userModule; }; }; packages.x86_64-linux = {