From b0c2c2e7809aded7dba8fd51ef32338b22de8394 Mon Sep 17 00:00:00 2001
From: lucy <l.k@k>
Date: Tue, 20 Oct 2026 00:10:56 +0200
Subject: [PATCH] add base_services modules

---
 modules/default.nix               | 3 ++-
 modules/home/programs/git.nix     | 6 ++++--
 modules/system/core/user.nix      | 1 +
 modules/system/services/base.nix  | 5 +++++
 modules/system/stylix/default.nix | 1 -
 modules/system/stylix/fonts.nix   | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 modules/system/services/base.nix

diff --git a/modules/default.nix b/modules/default.nix
index b6b8792..1a07e2a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,15 +6,16 @@
 let
   mods = with self.nixosModules; [
     agenix
+    base_services
     boot
     core
     easyroam
-    git
     myStylix
     packages
     pipewire
     programs
     stylixTargets
+    stylix_fonts
     tlp
     user
     zsh
diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix
index 8ea7529..cc73877 100644
--- a/modules/home/programs/git.nix
+++ b/modules/home/programs/git.nix
@@ -2,8 +2,10 @@
   flake.homeModules.git = {
     programs.git = {
       enable = true;
-      userName = "lucy";
-      userEmail = "lucykaufmann@protonmail.com";
+      settings = {
+        user.name = "lucy";
+        user.email = "lucykaufmann@protonmail.com";
+      };
     };
   };
 }
diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix
index ea1b077..2de9142 100644
--- a/modules/system/core/user.nix
+++ b/modules/system/core/user.nix
@@ -26,6 +26,7 @@
       ghostty
       niri
       emacs
+      git
       homeStylix
       fuzzel
     ];
diff --git a/modules/system/services/base.nix b/modules/system/services/base.nix
new file mode 100644
index 0000000..da34c8c
--- /dev/null
+++ b/modules/system/services/base.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.base_services = {
+    services.upower.enable = true;
+  };
+}
diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix
index ed37f8e..335844b 100644
--- a/modules/system/stylix/default.nix
+++ b/modules/system/stylix/default.nix
@@ -2,7 +2,6 @@
   flake.nixosModules.myStylix = { pkgs, ... }: {
     imports = [
       inputs.stylix.nixosModules.stylix
-      stylix_fonts
     ];
     stylix = {
       enable = true;
diff --git a/modules/system/stylix/fonts.nix b/modules/system/stylix/fonts.nix
index 8995166..d059197 100644
--- a/modules/system/stylix/fonts.nix
+++ b/modules/system/stylix/fonts.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.stylix_fonts = { pkgs, ... }: {
+  flake.nixosModules.stylix_fonts = { pkgs, config, ... }: {
     stylix.fonts = {
       serif = {
         package = config.stylix.fonts.monospace.package;