modules: init users.nix

hosts/kariru/default.nix

@@ -27,15 +27,6 @@
     xkbVariant = "";
   };
 
-  users = {
-    defaultUserShell = pkgs.nushell;
-    users.notoh = {
-      isNormalUser = true;
-      description = "notoh";
-      extraGroups = ["networkmanager" "wheel" "docker"];
-    };
-  };
-
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;

hosts/sakura/default.nix

@@ -27,16 +27,7 @@
     xkbVariant = "";
   };
 
-  users = {
+   programs.gnupg.agent = {
-    defaultUserShell = pkgs.nushell;
-    users.notoh = {
-      isNormalUser = true;
-      description = "notoh";
-      extraGroups = ["networkmanager" "wheel" "docker"];
-    };
-  };
-
-  programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
     pinentryFlavor = "curses";

hosts/tsuki/default.nix

@@ -88,15 +88,7 @@
       daemon.enable = true;
     };
   };
-  users = {
+  
-    defaultUserShell = pkgs.nushell;
-    users.notoh = {
-      isNormalUser = true;
-      description = "notoh";
-      extraGroups = ["networkmanager" "wheel" "disk" "video"];
-    };
-  };
-
   environment.systemPackages = with pkgs; [
     wget
     dconf

modules/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./security.nix
     ./networking.nix
+    ./users.nix
     ./nix.nix
     ./system.nix
     ./openssh.nix

modules/users.nix

@@ -0,0 +1,21 @@
+{
+  pkgs,
+  ...
+}: {
+
+users = {
+    defaultUserShell = pkgs.nushell;
+    users.notoh = {
+      isNormalUser = true;
+      description = "notoh";
+      extraGroups = [
+      "networkmanager" 
+      "wheel" 
+      "disk" 
+      "video"
+      "docker"
+      ];
+    };
+  };
+  
+}