diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 5d541ef..1d32df7 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -6,11 +6,6 @@
     ../../modules/home-manager
   ];
 
-  # Allow Unfree
-  nixpkgs.config.allowUnfree = true;
-
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
   home.username = "shoi";
   home.homeDirectory = "/home/shoi";
 
@@ -23,39 +18,18 @@
   # release notes.
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
   home.packages = with pkgs; [
-    # Essentials
-    firefox
-    ferdium
-    git
-    gh
-
-    # School
-    libreoffice-fresh
-    onedrive
-    typora
-    logisim
-    pandoc
-    aspell
-    aspellDicts.en
-    aspellDicts.en-computers
-
     # For funsies
     spotify
     vesktop
 
     # Other utility
-    corefonts
-    noto-fonts
     mullvad-vpn
     transmission_4-gtk
     imagemagick
   ];
 
-  programs.kitty.enable = true;
-
+  # Enable sound control
   services.easyeffects.enable = true;
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index d907ce4..94b8893 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,10 +1,32 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
     imports = [
         ./git
         ./ricing/catppuccin
-        ./shell
         ./vscode
+        ./terminal
+    ];
+
+    # Allow Unfree
+    nixpkgs.config.allowUnfree = true;
+
+    home.packages = with pkgs; [
+        # Essentials
+        firefox
+        ferdium
+        git
+        gh
+
+        # School
+        libreoffice-fresh
+        onedrive
+        typora
+        logisim
+        pandoc
+
+        # Utils
+        corefonts
+        noto-fonts
     ];
 }
\ No newline at end of file
diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix
new file mode 100644
index 0000000..8abe613
--- /dev/null
+++ b/modules/home-manager/terminal/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+    imports = [
+        ./shell
+    ];
+    programs.kitty.enable = true;
+}
\ No newline at end of file
diff --git a/modules/home-manager/shell/default.nix b/modules/home-manager/terminal/shell/default.nix
similarity index 100%
rename from modules/home-manager/shell/default.nix
rename to modules/home-manager/terminal/shell/default.nix