diff --git a/modules/#default.nix# b/modules/#default.nix#
deleted file mode 100644
index 85c0349..0000000
--- a/modules/#default.nix#
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}:
-let
-  mods = with self.nixosModules; [
-    user
-    packages
-    agenix
-    boot
-    core
-    easyroam
-    myStylix
-    stylixTargets
-    /etc/nixos/hardware-configuration.nix
-  ];
-in
-{
-  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    modules =
-      with self.nixosModules;
-      [
-        {
-          config.dualBoot = true;
-          config.networking.hostName = "nerv";
-        }
-      ]
-      ++ mods;
-  };
-  flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem {
-    modules = [
-      {
-        config.networking.hostName = "seele";
-      }
-    ]
-    ++ mods;
-  };
-
-}
diff --git a/modules/default.nix b/modules/default.nix
index fee437d..b6b8792 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,14 +5,19 @@
 }:
 let
   mods = with self.nixosModules; [
-    user
-    packages
     agenix
     boot
     core
     easyroam
+    git
     myStylix
+    packages
+    pipewire
+    programs
     stylixTargets
+    tlp
+    user
+    zsh
     /etc/nixos/hardware-configuration.nix
   ];
 in
diff --git a/modules/home/programs/ghostty.nix b/modules/home/programs/ghostty.nix
index abe638a..38b3914 100644
--- a/modules/home/programs/ghostty.nix
+++ b/modules/home/programs/ghostty.nix
@@ -3,6 +3,7 @@
     programs.ghostty = {
       enable = true;
       enableZshIntegration = true;
+      systemd.enable = true;
       settings = {
         window-padding-x = 15;
         window-padding-y = 15;
diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix
new file mode 100644
index 0000000..8ea7529
--- /dev/null
+++ b/modules/home/programs/git.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  flake.homeModules.git = {
+    programs.git = {
+      enable = true;
+      userName = "lucy";
+      userEmail = "lucykaufmann@protonmail.com";
+    };
+  };
+}
diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix
index c5a4cf3..ea1b077 100644
--- a/modules/system/core/user.nix
+++ b/modules/system/core/user.nix
@@ -1,9 +1,10 @@
 { inputs, self, ... }: {
-  flake.nixosModules.user = {
+  flake.nixosModules.user = { pkgs, ... }: {
     imports = [
       inputs.home-manager.nixosModules.home-manager
     ];
     users.users."lucy" = {
+      shell = pkgs.zsh;
       isNormalUser = true;
       description = "lucy";
       extraGroups = [
diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix
index cd8cf28..ed37f8e 100644
--- a/modules/system/stylix/default.nix
+++ b/modules/system/stylix/default.nix
@@ -2,11 +2,11 @@
   flake.nixosModules.myStylix = { pkgs, ... }: {
     imports = [
       inputs.stylix.nixosModules.stylix
+      stylix_fonts
     ];
     stylix = {
       enable = true;
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
-      
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";      
     };
   };
 }
diff --git a/modules/system/stylix/fonts.nix b/modules/system/stylix/fonts.nix
new file mode 100644
index 0000000..8995166
--- /dev/null
+++ b/modules/system/stylix/fonts.nix
@@ -0,0 +1,25 @@
+{ ... }: {
+  flake.nixosModules.stylix_fonts = { pkgs, ... }: {
+    stylix.fonts = {
+      serif = {
+        package = config.stylix.fonts.monospace.package;
+        name = config.stylix.fonts.monospace.name;
+      };
+
+      sansSerif = {
+        package = config.stylix.fonts.monospace.package;
+        name = config.stylix.fonts.monospace.name;
+      };
+
+      monospace = {
+        package = pkgs.iosevka;
+        name = "DejaVu Sans Mono";
+      };
+
+      emoji = {
+        package = pkgs.noto-fonts-color-emoji;
+        name = "Noto Color Emoji";
+      };
+    };
+  };
+}