diff --git a/flake.nix b/flake.nix index 38b305a..7c7f29f 100644 --- a/flake.nix +++ b/flake.nix @@ -196,17 +196,17 @@ home-manager.nixosModules.home-manager nix-index-database.nixosModules.nix-index - #agenix.nixosModules.default - #{ - # age.secrets = { - # motiejus-work-passwd-hash.file = ./secrets/motiejus_work_passwd_hash.age; - # root-work-passwd-hash.file = ./secrets/root_work_passwd_hash.age; - # #sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; + agenix.nixosModules.default + { + age.secrets = { + motiejus-passwd-hash.file = ./secrets/motiejus_work_passwd_hash.age; + root-passwd-hash.file = ./secrets/root_work_passwd_hash.age; + sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; - # #syncthing-key.file = ./secrets/mtworx/syncthing/key.pem.age; - # #syncthing-cert.file = ./secrets/mtworx/syncthing/cert.pem.age; - # }; - #} + #syncthing-key.file = ./secrets/mtworx/syncthing/key.pem.age; + #syncthing-cert.file = ./secrets/mtworx/syncthing/cert.pem.age; + }; + } ]; specialArgs = { diff --git a/hosts/vno1-gdrx/configuration.nix b/hosts/vno1-gdrx/configuration.nix index 2ab1daa..20f6a9b 100644 --- a/hosts/vno1-gdrx/configuration.nix +++ b/hosts/vno1-gdrx/configuration.nix @@ -64,10 +64,8 @@ in base.users = { enable = true; devTools = true; - root.initialPassword = "live"; - user.initialPassword = "live"; - #root.hashedPasswordFile = config.age.secrets.root-work-passwd-hash.path; - #user.hashedPasswordFile = config.age.secrets.motiejus-work-passwd-hash.path; + root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; + user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; }; services = { @@ -101,17 +99,17 @@ in # toUser = config.mj.username; #}; - #remote-builder.client = - # let - # host = myData.hosts."fra1-b.servers.jakst"; - # in - # { - # enable = true; - # inherit (host) system supportedFeatures; - # hostName = host.jakstIP; - # sshKey = "/etc/ssh/ssh_host_ed25519_key"; - # maxJobs = 2; - # }; + remote-builder.client = + let + host = myData.hosts."fra1-b.servers.jakst"; + in + { + enable = true; + inherit (host) system supportedFeatures; + hostName = host.jakstIP; + sshKey = "/etc/ssh/ssh_host_ed25519_key"; + maxJobs = 2; + }; node_exporter = { enable = true; @@ -128,10 +126,10 @@ in }; }; - #postfix = { - # enable = true; - # saslPasswdPath = config.age.secrets.sasl-passwd.path; - #}; + postfix = { + enable = true; + saslPasswdPath = config.age.secrets.sasl-passwd.path; + }; #syncthing = { # enable = true;