From 6d4453b6189ae5024c04c1d2013446dd2449d0eb Mon Sep 17 00:00:00 2001
From: Satria <admin@satr14.my.id>
Date: Sun, 1 Feb 2026 18:01:09 +0700
Subject: [PATCH] add user conf and split some configs

---
 README.md                        |  5 +++--
 host/thinkpad/home.nix           |  3 +++
 modules/hardware/hibernation.nix | 10 ++++++++++
 modules/hardware/thinkpad.nix    | 20 ++++++--------------
 modules/hardware/tzupdate.nix    |  7 +++++++
 modules/system/user.nix          | 23 +++++++++++++++++++++++
 6 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 modules/hardware/hibernation.nix
 create mode 100644 modules/hardware/tzupdate.nix
 create mode 100644 modules/system/user.nix

diff --git a/README.md b/README.md
index 77452d7..4eac18e 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@ rewrite of my nixos flake with hopefully better structuring and modularity
 
 # todo
 - (progress) migrate files to this repository in the modules folder
-- split the files into little chunks for 1 specific purposes per file
+- (half-progress) split the files into little chunks for 1 specific purposes per file
+- (quater-progress) reintegrate file paths and arguments to work together
 
 # todo: migrate files below
 [X] flake stuff (flake.nix & flake.lock)
@@ -12,7 +13,7 @@ rewrite of my nixos flake with hopefully better structuring and modularity
 [X] nixos system
 [X] base nix configs
 [X] apps list
-[ ] user config (not hm)
+[X] user config (not hm)
 
 [ ] home manager config
 [ ] rice config (everything in /rice)
diff --git a/host/thinkpad/home.nix b/host/thinkpad/home.nix
index e69de29..49afe3d 100644
--- a/host/thinkpad/home.nix
+++ b/host/thinkpad/home.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  
+}
\ No newline at end of file
diff --git a/modules/hardware/hibernation.nix b/modules/hardware/hibernation.nix
new file mode 100644
index 0000000..45fa795
--- /dev/null
+++ b/modules/hardware/hibernation.nix
@@ -0,0 +1,10 @@
+{ resume-dev, ... }: {
+  security.protectKernelImage = false; # https://discourse.nixos.org/t/hibernate-doesnt-work-anymore/24673/7
+  boot = {
+    kernelParams = if resume-dev == "" then [] else ["resume=${resume-dev}"];
+    resumeDevice = "${resume-dev}";
+  };
+  powerManagement = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix
index 7324286..a57fd9f 100644
--- a/modules/hardware/thinkpad.nix
+++ b/modules/hardware/thinkpad.nix
@@ -1,11 +1,10 @@
-{ pkgs, lib, resume-dev, ... }: {
-  time.timeZone = lib.mkForce null;
-  powerManagement = {
-    enable = true;
-    powertop.enable = true;
-  };
+{ pkgs, ... }: {
+  import = [
+    ./tzupdate.nix
+    ./hibernation.nix
+  ];
+  powerManagement.powertop.enable = true;
   security = {
-    protectKernelImage = false; # https://discourse.nixos.org/t/hibernate-doesnt-work-anymore/24673/7
     tpm2 = {
       enable = true;
       pkcs11.enable = true;
@@ -30,9 +29,6 @@
     };
   };
   boot = {
-    kernelParams = if resume-dev == "" then [] else ["resume=${resume-dev}"];
-    resumeDevice = "${resume-dev}";
-
     kernelPackages = pkgs.linuxPackages;
     kernel.sysctl."vm.laptop_mode" = 5;
     initrd.availableKernelModules = [ "thinkpad_acpi" ];
@@ -54,10 +50,6 @@
         echo 85 > /sys/class/power_supply/BAT1/charge_control_end_threshold || true
       ''}"
     '';
-    tzupdate = {
-      enable = true;
-      timer.enable = true;
-    };
     upower = {
       enable = true;
       percentageCritical = 15;
diff --git a/modules/hardware/tzupdate.nix b/modules/hardware/tzupdate.nix
new file mode 100644
index 0000000..06189ed
--- /dev/null
+++ b/modules/hardware/tzupdate.nix
@@ -0,0 +1,7 @@
+{ lib, ... }: {
+  time.timeZone = lib.mkForce null;
+  services.tzupdate = {
+    enable = true;
+    timer.enable = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/system/user.nix b/modules/system/user.nix
new file mode 100644
index 0000000..95736c5
--- /dev/null
+++ b/modules/system/user.nix
@@ -0,0 +1,23 @@
+{ pkgs, username, ... }: {
+  users = {
+    users."${username}" = {
+      linger = true;
+      isNormalUser = true;
+      description = "${username}";
+      initialPassword = "${username}";
+      shell = pkgs.zsh;
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "dialout"
+        "libvirtd"
+        "docker"
+        "input"
+        "uinput"
+        "ydotool"
+        "adbusers"
+        "kvm"
+      ];
+    };
+  };
+}