sync sops and users

Signed-off-by: unexplrd <unexplrd@linerds.us>

hosts/dunamis/sops.nix

@@ -3,9 +3,15 @@
   inputs,
   ...
 }: let
-  s = inputs.mysecrets;
+  inherit (inputs) mysecrets;
-  hostname = config.networking.hostName;
+  # TODO: stop relying on networking.hostName
-  sopsFile = "${s}/hosts/${hostname}.yaml";
+  inherit (config.networking) hostName;
+  sopsFile = mysecrets + "/hosts/${hostName}.yaml";
+  dotSsh = name: "/home/user/.ssh/" + name;
+  sshKey = {
+    mode = "0400";
+    owner = "user";
+  };
 in {
   imports = with inputs; [
     sops-nix.nixosModules.sops
@@ -17,45 +23,39 @@ in {
       keyFile = "/var/lib/sops-nix/key.txt";
       generateKey = true;
     };
-    defaultSopsFile = "${s}/common.yaml";
+    defaultSopsFile = mysecrets + "/common.yaml";
     secrets = {
       "user-password-hashed".neededForUsers = true;
       "ssh-config" = {
-        path = "/home/user/.ssh/config";
+        path = dotSsh "config";
         mode = "0400";
         owner = "user";
       };
-      "ssh-${hostname}-user" = {
+      "ssh-${hostName}-user" = {
         inherit sopsFile;
-        path = "/home/user/.ssh/id_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_ed25519";
-        owner = "user";
       };
-      "ssh-${hostname}-user.pub" = {
+      "ssh-${hostName}-user.pub" = {
         inherit sopsFile;
-        path = "/home/user/.ssh/id_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_ed25519.pub";
-        owner = "user";
       };
       "ssh-unexplrd" = {
-        path = "/home/user/.ssh/id_unexplrd_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_unexplrd_ed25519";
-        owner = "user";
       };
       "ssh-unexplrd.pub" = {
-        path = "/home/user/.ssh/id_unexplrd_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_unexplrd_ed25519.pub";
-        owner = "user";
       };
       "ssh-uni" = {
-        path = "/home/user/.ssh/id_uni_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_uni_ed25519";
-        owner = "user";
       };
       "ssh-uni.pub" = {
-        path = "/home/user/.ssh/id_uni_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_uni_ed25519.pub";
-        owner = "user";
       };
     };
   };

hosts/eldrid/sops.nix

@@ -3,9 +3,15 @@
   inputs,
   ...
 }: let
-  s = inputs.mysecrets;
+  inherit (inputs) mysecrets;
-  hostname = config.networking.hostName;
+  # TODO: stop relying on networking.hostName
-  sopsFile = "${s}/hosts/${hostname}.yaml";
+  inherit (config.networking) hostName;
+  sopsFile = mysecrets + "/hosts/${hostName}.yaml";
+  dotSsh = name: "/home/user/.ssh/" + name;
+  sshKey = {
+    mode = "0400";
+    owner = "user";
+  };
 in {
   imports = with inputs; [
     sops-nix.nixosModules.sops
@@ -17,45 +23,38 @@ in {
       keyFile = "/var/lib/sops-nix/key.txt";
       generateKey = true;
     };
-    defaultSopsFile = "${s}/common.yaml";
+    defaultSopsFile = mysecrets + "/common.yaml";
     secrets = {
       "user-password-hashed".neededForUsers = true;
       "ssh-config" = {
-        path = "/home/user/.ssh/config";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "config";
-        owner = "user";
       };
-      "ssh-${hostname}-user" = {
+      "ssh-${hostName}-user" = {
         inherit sopsFile;
-        path = "/home/user/.ssh/id_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_ed25519";
-        owner = "user";
       };
-      "ssh-${hostname}-user.pub" = {
+      "ssh-${hostName}-user.pub" = {
         inherit sopsFile;
-        path = "/home/user/.ssh/id_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_ed25519.pub";
-        owner = "user";
       };
       "ssh-unexplrd" = {
-        path = "/home/user/.ssh/id_unexplrd_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_unexplrd_ed25519";
-        owner = "user";
       };
       "ssh-unexplrd.pub" = {
-        path = "/home/user/.ssh/id_unexplrd_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_unexplrd_ed25519.pub";
-        owner = "user";
       };
       "ssh-uni" = {
-        path = "/home/user/.ssh/id_uni_ed25519";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_uni_ed25519";
-        owner = "user";
       };
       "ssh-uni.pub" = {
-        path = "/home/user/.ssh/id_uni_ed25519.pub";
+        inherit (sshKey) mode owner;
-        mode = "0400";
+        path = dotSsh "id_uni_ed25519.pub";
-        owner = "user";
       };
     };
   };

hosts/eldrid/users.nix

@@ -4,27 +4,22 @@
   pkgs,
   ...
 }: let
-  sopSec = config.sops.secrets;
+  inherit (config.sops) secrets;
-  secrets = inputs.mysecrets;
+  inherit (inputs) mysecrets;
 in {
   nix.settings.trusted-users = ["user"];
   users.mutableUsers = false;
   users.users = {
     user = {
-      hashedPasswordFile = sopSec."user-password-hashed".path;
+      hashedPasswordFile = secrets."user-password-hashed".path;
-      # passwordFile = config.sops.secrets.user-password.path;
-      isNormalUser = true;
       extraGroups = ["wheel" "video" "libvirtd" "dialout"];
+      isNormalUser = true;
       shell = pkgs.fish;
-      openssh.authorizedKeys.keyFiles = [
+      openssh.authorizedKeys.keyFiles = map (f: "${mysecrets}/ssh/user/${f}") [
-        "${secrets}/ssh/id_ed25519_sarien_user.pub"
+        "id_dunamis_ed25519.pub"
-        "${secrets}/ssh/id_ed25519_eldrid_user.pub"
+        "id_eldrid_ed25519.pub"
+        "id_sarien_ed25519.pub"
       ];
     };
-    # work = {
-    #   isNormalUser = true;
-    #   extraGroups = ["video"];
-    #   shell = pkgs.nushell;
-    # };
   };
 }

hosts/sarien/sops.nix

@@ -1,8 +1,4 @@
-{
+{inputs, ...}: let
-  config,
-  inputs,
-  ...
-}: let
   inherit (inputs) mysecrets;
   # TODO: stop relying on networking.hostName
   hostname = "sarien";