diff --git a/nix/modules/desktop/desktop.nix b/nix/modules/desktop/desktop.nix
index c281efed4..f0e754c22 100644
--- a/nix/modules/desktop/desktop.nix
+++ b/nix/modules/desktop/desktop.nix
@@ -35,9 +35,18 @@ in {
     environment.etc."skel/.config/quickshell" = {
       source = "../../../.config/quickshell";
     };
-    environment.etc."oneui-icons" = {
+    environment.etc."skel/.local/share/OneUI" = {
       source = inputs.oneUI;
     };
+    environment.etc."skel/.config/hypr" = {
+      source = "../../../.config/hypr";
+    };
+    environment.etc."skel/.config/matugen" = {
+      source = "../../../.config/matugen";
+    };
+    environment.etc."skel/.config/fuzzel" = {
+      source = "../../../.config/fuzzel";
+    };
     environment.systemPackages = with pkgs;
     # --- Illogical Impulse Audio Dependencies ---
       [
@@ -98,7 +107,7 @@ in {
       ]
       # --- Illogical Impulse Hyprland  Dependencies ---
       ++ [
-        hyprland.packages.${pkgs.system}.default
+        # hyprland.packages.${pkgs.system}.default
         hypridle
         hyprcursor
         hyprlang
diff --git a/nix/modules/desktop/pkgs/fuzzel.nix b/nix/modules/desktop/pkgs/fuzzel.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/desktop/pkgs/matugen.nix b/nix/modules/desktop/pkgs/matugen.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/terminal/pkgs/fish.nix b/nix/modules/terminal/pkgs/fish.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/terminal/pkgs/foot.nix b/nix/modules/terminal/pkgs/foot.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/terminal/pkgs/kitty.nix b/nix/modules/terminal/pkgs/kitty.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/terminal/pkgs/starship.nix b/nix/modules/terminal/pkgs/starship.nix
new file mode 100644
index 000000000..e69de29bb
diff --git a/nix/modules/terminal/terminal.nix b/nix/modules/terminal/terminal.nix
index 1c4418593..c154b501e 100644
--- a/nix/modules/terminal/terminal.nix
+++ b/nix/modules/terminal/terminal.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit
@@ -12,6 +13,13 @@
     types
     ;
   cfg = config.illogical-impulse.terminal;
+
+  commonTerminalConfig = {
+    environment.systemPackages = with pkgs; [
+      starship
+      eza
+    ];
+  };
 in {
   options = {
     illogical-impulse.terminal = {
@@ -22,8 +30,6 @@ in {
           Whether to enable the terminal-related configuration for this user.
         '';
       };
-
-      # New option to choose the terminal emulator.
       terminalEmulator = mkOption {
         type = types.enum ["foot" "kitty"];
         default = "foot";
@@ -34,17 +40,29 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf (cfg.terminalEmulator == "foot") {
-      programs.foot = {
-        enable = true;
-      };
-    })
+  config = mkIf cfg.enable (
+    mkMerge [
+      commonTerminalConfig
 
-    (mkIf (cfg.terminalEmulator == "kitty") {
-      programs.kitty = {
-        enable = true;
-      };
-    })
-  ]);
+      (mkIf (cfg.terminalEmulator == "foot") {
+        programs.foot = {
+          enable = true;
+          # Foot-specific configuration
+          settings = {
+            main.font = "FiraCode Nerd Font:size=10";
+          };
+        };
+      })
+
+      (mkIf (cfg.terminalEmulator == "kitty") {
+        programs.kitty = {
+          enable = true;
+          settings = {
+            font_family = "FiraCode Nerd Font Mono";
+            font_size = 10.0;
+          };
+        };
+      })
+    ]
+  );
 }