diff --git a/home/default.nix b/home/default.nix
index a8ed3cf..9b39dbe 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,27 +1,10 @@
 # This file contains default settings used across different systems
 {
   imports = [
-    ./ssh
     ./hypridle
     ./hyprland
-    ./vscode
     ./foot.nix
+    ./graphical
+    ./terminal
   ];
-
-  dconf.settings = {
-    "org/gnome/Lollypop" = {
-      network-access = true;
-      artist-artwork = true;
-      dark-ui = true;
-      import-advanced-artist-tags = true;
-      force-single-column = false;
-      show-compilations-in-album-view = true;
-      show-compilations = false;
-      hd-artwork = true;
-      shown-playlists = [
-        (-3)
-        (-7)
-      ];
-    };
-  };
 }
diff --git a/home/graphical/default.nix b/home/graphical/default.nix
new file mode 100644
index 0000000..66f3211
--- /dev/null
+++ b/home/graphical/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./firefox
+    ./thunderbird
+    ./vscode
+    ./lollypop
+  ];
+}
diff --git a/home/firefox/default.nix b/home/graphical/firefox/default.nix
similarity index 100%
rename from home/firefox/default.nix
rename to home/graphical/firefox/default.nix
diff --git a/home/graphical/lollypop/default.nix b/home/graphical/lollypop/default.nix
new file mode 100644
index 0000000..31b2e60
--- /dev/null
+++ b/home/graphical/lollypop/default.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.lollypop ];
+
+  dconf.settings = {
+    "org/gnome/Lollypop" = {
+      network-access = true;
+      artist-artwork = true;
+      dark-ui = true;
+      import-advanced-artist-tags = true;
+      force-single-column = false;
+      show-compilations-in-album-view = true;
+      show-compilations = false;
+      hd-artwork = true;
+      shown-playlists = [
+        (-3)
+        (-7)
+      ];
+    };
+  };
+}
diff --git a/home/thunderbird/default.nix b/home/graphical/thunderbird/default.nix
similarity index 100%
rename from home/thunderbird/default.nix
rename to home/graphical/thunderbird/default.nix
diff --git a/home/vscode/default.nix b/home/graphical/vscode/default.nix
similarity index 100%
rename from home/vscode/default.nix
rename to home/graphical/vscode/default.nix
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
new file mode 100644
index 0000000..228200d
--- /dev/null
+++ b/home/terminal/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./neovim
+    ./ssh
+    ./git
+    ./fish
+  ];
+}
diff --git a/home/fish/default.nix b/home/terminal/fish/default.nix
similarity index 100%
rename from home/fish/default.nix
rename to home/terminal/fish/default.nix
diff --git a/home/fish/fish_prompt.fish b/home/terminal/fish/fish_prompt.fish
similarity index 100%
rename from home/fish/fish_prompt.fish
rename to home/terminal/fish/fish_prompt.fish
diff --git a/home/git/default.nix b/home/terminal/git/default.nix
similarity index 100%
rename from home/git/default.nix
rename to home/terminal/git/default.nix
diff --git a/home/neovim/default.nix b/home/terminal/neovim/default.nix
similarity index 100%
rename from home/neovim/default.nix
rename to home/terminal/neovim/default.nix
diff --git a/home/ssh/default.nix b/home/terminal/ssh/default.nix
similarity index 100%
rename from home/ssh/default.nix
rename to home/terminal/ssh/default.nix
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index bfb517a..cbd8af2 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -7,11 +7,6 @@
 {
   home-manager.users.${username} = {
     imports = [
-      ../../home/firefox
-      ../../home/fish
-      ../../home/neovim
-      ../../home/thunderbird
-      ../../home/git
       ../../home/rofi
       ../../home/swaync
       ../../home/waybar
@@ -26,8 +21,6 @@
       nix-direnv.enable = true;
     };
 
-    programs.vscode.enable = true;
-
     services.blueman-applet.enable = true;
 
     home = {
@@ -51,7 +44,6 @@
         thunderbird
         keepassxc
         nautilus
-        lollypop
         protonmail-bridge-gui
         varia
         signal-desktop
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 51b86f5..c9012b0 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -7,13 +7,8 @@
 {
   home-manager.users.${username} = {
     imports = [
-      ../../home/firefox
-      ../../home/fish
       ../../home/sway
-      ../../home/neovim
       ../../home/rofi
-      ../../home/thunderbird
-      ../../home/git
       ../../home/themes/catppuccin.nix
       ../../home
     ];
@@ -49,7 +44,6 @@
         thunderbird
         keepassxc
         nautilus
-        lollypop
         protonmail-bridge-gui
         varia
         signal-desktop