host: 抽出我的用户配置

hosts/eris/configuration.nix

@@ -11,6 +11,7 @@
       ./hardware-configuration.nix
       inputs.sops-nix.nixosModules.sops
       ../modules/nix-cache.nix
+      ../modules/users/origami.nix
     ];
 
   boot.loader = {
@@ -145,19 +146,10 @@
   services.tailscale.enable = true;
 
   # Users
-  programs.fish.enable = true;
   users.groups.origami.gid = 1000;
-  users.users.origami = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    description = "Origami404";
-    group = "origami";
-    extraGroups = [ "networkmanager" "wheel" ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZxRoweHoLfoaydPqhsLnc4EGgwTp7Uz1DZ2DG447B+ origami@fedora"
-    ];
-  };
+  users.users.origami.extraGroups = [ "wheel" "networkmanager" ];
   security.sudo.wheelNeedsPassword = false;
+
   sops.defaultSopsFile = ../../secrets/ssh-private.yaml;
   sops.defaultSopsFormat = "yaml";
   sops.age.keyFile = "/home/origami/.config/sops/age/keys.txt";

hosts/modules/users/origami.nix

@@ -0,0 +1,13 @@
+{
+  ...
+}:
+{
+  users.users.origami = {
+    isNormalUser = true;
+    description = "Origami404";
+    group = "origami";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyrUiSdpTC+vP+pNDChehLG+ChYL2By2LtjmVJiHmaf origami@eris"
+    ];
+  };
+}

hosts/oparic-local-dev/configuration.nix

@@ -6,6 +6,7 @@
       ./hardware-configuration.nix
       inputs.sops-nix.nixosModules.sops
       ../modules/nix-cache.nix
+      ../modules/users/origami.nix
     ];
 
   # BIOS + GRUB, 安装到 MBR
@@ -78,18 +79,8 @@
   services.qemuGuest.enable = true;
 
   # 用户
-  programs.fish.enable = true;
   users.groups.origami.gid = 1000;
-  users.users.origami = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    description = "Origami404";
-    group = "origami";
-    extraGroups = [ "wheel" ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZxRoweHoLfoaydPqhsLnc4EGgwTp7Uz1DZ2DG447B+ origami@fedora"
-    ];
-  };
+  users.users.origami.extraGroups = [ "wheel" ];
   security.sudo.wheelNeedsPassword = false;
 
   sops.defaultSopsFile = ../../secrets/ssh-private.yaml;