add base_services modules

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

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";
+      };
     };
   };
 }

modules/system/core/user.nix

@@ -26,6 +26,7 @@
       ghostty
       niri
       emacs
+      git
       homeStylix
       fuzzel
     ];

modules/system/services/base.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  flake.nixosModules.base_services = {
+    services.upower.enable = true;
+  };
+}

modules/system/stylix/default.nix

@@ -2,7 +2,6 @@
   flake.nixosModules.myStylix = { pkgs, ... }: {
     imports = [
       inputs.stylix.nixosModules.stylix
-      stylix_fonts
     ];
     stylix = {
       enable = true;

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;