From 8fe1513e50ff384ac23dfc8a331ba47fea94cb33 Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Wed, 17 May 2023 12:54:50 -0400
Subject: [PATCH] modules: init users.nix

---
 hosts/kariru/default.nix |  9 ---------
 hosts/sakura/default.nix | 11 +----------
 hosts/tsuki/default.nix  | 10 +---------
 modules/default.nix      |  1 +
 modules/users.nix        | 21 +++++++++++++++++++++
 5 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 modules/users.nix

diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix
index 60c333c..58c9bd6 100644
--- a/hosts/kariru/default.nix
+++ b/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;
diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index 3256d88..865f77f 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -27,16 +27,7 @@
     xkbVariant = "";
   };
 
-  users = {
-    defaultUserShell = pkgs.nushell;
-    users.notoh = {
-      isNormalUser = true;
-      description = "notoh";
-      extraGroups = ["networkmanager" "wheel" "docker"];
-    };
-  };
-
-  programs.gnupg.agent = {
+   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
     pinentryFlavor = "curses";
diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix
index 1364079..eac54cb 100755
--- a/hosts/tsuki/default.nix
+++ b/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
diff --git a/modules/default.nix b/modules/default.nix
index 319164d..bf24d12 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./security.nix
     ./networking.nix
+    ./users.nix
     ./nix.nix
     ./system.nix
     ./openssh.nix
diff --git a/modules/users.nix b/modules/users.nix
new file mode 100644
index 0000000..8ec454a
--- /dev/null
+++ b/modules/users.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  ...
+}: {
+
+users = {
+    defaultUserShell = pkgs.nushell;
+    users.notoh = {
+      isNormalUser = true;
+      description = "notoh";
+      extraGroups = [
+      "networkmanager" 
+      "wheel" 
+      "disk" 
+      "video"
+      "docker"
+      ];
+    };
+  };
+  
+}
\ No newline at end of file