diff --git a/common/users/homeModules/terminal.nix b/common/users/homeModules/terminal.nix
deleted file mode 100644
index 91106e9..0000000
--- a/common/users/homeModules/terminal.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{pkgs, ...}: {
-    home = {
-        packages = with pkgs; [
-            warp-terminal
-            kitty
-            onefetch
-            hyfetch
-            neofetch
-        ];
-        file = {
-            kitty = {
-                recursive = true;
-                source = ../../../dotfiles/kitty;
-                target = "./.config/kitty";
-            };
-        };
-    };
-}
diff --git a/common/users/homeModules/terminal/cli.nix b/common/users/homeModules/terminal/cli.nix
new file mode 100644
index 0000000..05753f9
--- /dev/null
+++ b/common/users/homeModules/terminal/cli.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      onefetch
+      hyfetch
+      neofetch
+    ];
+  };
+}
diff --git a/common/users/homeModules/terminal/default.nix b/common/users/homeModules/terminal/default.nix
new file mode 100644
index 0000000..fa94e1b
--- /dev/null
+++ b/common/users/homeModules/terminal/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [
+    ./gui.nix
+    ./cli.nix
+  ];
+}
diff --git a/common/users/homeModules/terminal/gui.nix b/common/users/homeModules/terminal/gui.nix
new file mode 100644
index 0000000..a1daf8f
--- /dev/null
+++ b/common/users/homeModules/terminal/gui.nix
@@ -0,0 +1,7 @@
+
+{pkgs, ...}: {
+    imports = [
+        ./kitty.nix
+        ./warp.nix
+    ];
+}
diff --git a/common/users/homeModules/terminal/kitty.nix b/common/users/homeModules/terminal/kitty.nix
new file mode 100644
index 0000000..71035c1
--- /dev/null
+++ b/common/users/homeModules/terminal/kitty.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      kitty
+    ];
+    file = {
+      kitty = {
+        recursive = true;
+        source = ../../../dotfiles/kitty;
+        target = "./.config/kitty";
+      };
+    };
+    shellAliases = {
+      "icat" = "kitten icat";
+    };
+  };
+}
diff --git a/common/users/homeModules/terminal/warp.nix b/common/users/homeModules/terminal/warp.nix
new file mode 100644
index 0000000..a69ac3c
--- /dev/null
+++ b/common/users/homeModules/terminal/warp.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      warp-terminal
+    ];
+  };
+}
diff --git a/common/users/meyer/home.nix b/common/users/meyer/home.nix
index c9cb41f..d485145 100644
--- a/common/users/meyer/home.nix
+++ b/common/users/meyer/home.nix
@@ -35,7 +35,7 @@
     ../homeModules/rofi.nix
     ../homeModules/social.nix
     ../homeModules/sops.nix
-    ../homeModules/terminal.nix
+    ../homeModules/terminal
     ../homeModules/virt.nix
     ../homeModules/web.nix
     ../homeModules/zsh.nix