sys/users: move out of sys/default.nix

2 files changed, 53 insertions, 47 deletions

diff --git a/sys/default.nix b/sys/default.nix
index 1a35d92..6ea2438 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -7,6 +7,7 @@ in {
     "${modulesPath}/installer/scan/not-detected.nix"
     ./fs
     ./options.nix
+    ./users.nix
   ];
 
   config = {
@@ -103,6 +104,7 @@ in {
     };
 
     time.timeZone = "America/Costa_Rica";
+    i18n.defaultLocale = "es_CR.UTF-8";
 
     networking = {
       hostName = cfg.hostname;
@@ -116,24 +118,8 @@ in {
       wireguard.enable = true;
     };
 
-    i18n.defaultLocale = "es_CR.UTF-8";
-
-    sound.enable = true;
-    hardware.pulseaudio.enable = true;
-
-    services.xserver = {
-      enable = true;
-      videoDrivers = cfg.videoDrivers ++ [ "modesetting" "fbdev" ];
-      libinput.enable = true;
-      displayManager.startx.enable = true;
-    };
-
     environment.systemPackages = [ pkgs.dhcpcd pkgs.git ];
 
-    services.udev.packages = [
-      pkgs.android-udev-rules
-    ];
-
     security.pam = {
       oath = {
         usersFile = "/var/trust/auth/users.oath";
@@ -172,36 +158,5 @@ in {
     };
 
     networking.firewall.allowedTCPPorts = [ 2234 ];
-
-    programs = {
-      dconf.enable = true;
-      zsh.enable = true;
-    };
-
-    environment.pathsToLink = [ "/share/zsh" ];
-
-    users.users = {
-      ale = {
-        isNormalUser = true;
-        uid = 1000;
-        group = "ale";
-        extraGroups = [ "users" "wheel" "adbusers" ];
-        shell = pkgs.zsh;
-      };
-
-      tutorias = {
-        isNormalUser = true;
-        uid = 1004;
-        group = "tutorias";
-        extraGroups = [ "users" ];
-        shell = pkgs.zsh;
-      };
-    };
-
-    users.groups = {
-      ale.gid = 1001;
-      tutorias.gid = 1007;
-      adbusers.gid = 1008;
-    };
   };
 }
diff --git a/sys/users.nix b/sys/users.nix
new file mode 100644
index 0000000..8c8be6b
--- /dev/null
+++ b/sys/users.nix
@@ -0,0 +1,51 @@
+{ lib, config, pkgs, ... }:
+with lib; let
+  cfg = config.local;
+in {
+  config = {
+    sound.enable = true;
+    hardware.pulseaudio.enable = true;
+
+    services.xserver = {
+      enable = true;
+      videoDrivers = cfg.videoDrivers ++ [ "modesetting" "fbdev" ];
+      libinput.enable = true;
+      displayManager.startx.enable = true;
+    };
+
+    services.udev.packages = [
+      pkgs.android-udev-rules
+    ];
+
+    programs = {
+      dconf.enable = true;
+      zsh.enable = true;
+    };
+
+    environment.pathsToLink = [ "/share/zsh" ];
+
+    users.users = {
+      ale = {
+        isNormalUser = true;
+        uid = 1000;
+        group = "ale";
+        extraGroups = [ "users" "wheel" "adbusers" ];
+        shell = pkgs.zsh;
+      };
+
+      tutorias = {
+        isNormalUser = true;
+        uid = 1004;
+        group = "tutorias";
+        extraGroups = [ "users" ];
+        shell = pkgs.zsh;
+      };
+    };
+
+    users.groups = {
+      ale.gid = 1001;
+      tutorias.gid = 1007;
+      adbusers.gid = 1008;
+    };
+  };
+}