diff --git a/nixos/home/collections/common/desktop.nix b/nixos/home/collections/common/desktop.nix
new file mode 100644
index 00000000..638dde01
--- /dev/null
+++ b/nixos/home/collections/common/desktop.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ../../browser/librewolf.nix
+    ../../desktop/wayland/hyprland.nix
+    ../../env/bash.nix
+    ../../env/fish.nix
+    ../../env/bat.nix
+    ../../env/direnv.nix
+    ../../env/keychain.nix
+    ../../env/ssh.nix
+    ../../env/starship.nix
+    ../../terminal/wezterm.nix
+    ../../tui/neovim.nix
+    ../../tui/lazygit.nix
+  ];
+  home.packages = with pkgs; [
+    bitwarden
+    file
+    marktext
+    silver-searcher
+    signal-desktop
+    zotero
+  ];
+}
diff --git a/nixos/home/collections/personal/default.nix b/nixos/home/collections/personal/default.nix
index 88293d1b..aef83989 100644
--- a/nixos/home/collections/personal/default.nix
+++ b/nixos/home/collections/personal/default.nix
@@ -1,35 +1,15 @@
 { pkgs, ... }:
 {
   imports = [
-    ../../browser/librewolf.nix
-    ../../desktop/wayland/hyprland.nix
-    ../../env/fonts/firacode.nix
-    ../../env/shell/bash.nix
-    ../../env/shell/fish.nix
-    ../../env/bat.nix
-    ../../env/direnv.nix
-    ../../env/keychain.nix
-    ../../env/nixpkgs.nix
-    ../../env/ssh.nix
-    ../../env/starship.nix
+    ../common/desktop.nix
     ../../git/personal.nix
-    ../../terminal/foot.nix
-    ../../terminal/wezterm.nix
-    ../../tui/neovim.nix
-    ../../tui/lazygit.nix
   ];
   home.packages = with pkgs; [
-    bitwarden
-    file
-    marktext
     mesa
     neovide
     nomachine-client
     otpclient
-    silver-searcher
-    signal-desktop
     steam
     steam-run
-    zotero
   ];
 }
diff --git a/nixos/home/collections/work/default.nix b/nixos/home/collections/work/default.nix
index 1566b1db..68d7b09f 100644
--- a/nixos/home/collections/work/default.nix
+++ b/nixos/home/collections/work/default.nix
@@ -1,35 +1,15 @@
 { pkgs, ... }:
 {
   imports = [
-    ../../browser/librewolf.nix
-    ../../desktop/wayland/hyprland.nix
-    ../../env/fonts/firacode.nix
-    ../../env/shell/bash.nix
-    ../../env/shell/fish.nix
-    ../../env/bat.nix
-    ../../env/direnv.nix
-    ../../env/keychain.nix
-    ../../env/nixpkgs.nix
-    ../../env/ssh.nix
-    ../../env/starship.nix
+    ../common/desktop.nix
     ../../git/work.nix
-    ../../terminal/wezterm.nix
-    ../../terminal/foot.nix
-    ../../tui/neovim.nix
-    ../../tui/lazygit.nix
   ];
   home.packages = with pkgs; [
-    bitwarden
-    file
     libreoffice-fresh
-    marktext
     neovide
     nomachine-client
     otpclient
-    silver-searcher
-    signal-desktop
     teams
     zoom-us
-    zotero
   ];
 }
diff --git a/nixos/home/desktop/wayland/hyprland.nix b/nixos/home/desktop/wayland/hyprland.nix
index f45aa06d..fd3df7f7 100644
--- a/nixos/home/desktop/wayland/hyprland.nix
+++ b/nixos/home/desktop/wayland/hyprland.nix
@@ -30,6 +30,7 @@ in
     # text = "# test";
   };
   xsession.enable = true;
+  programs.keychain.enableXsessionIntegration = true;
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland = {
diff --git a/nixos/home/desktop/wayland/waybar.nix b/nixos/home/desktop/wayland/waybar.nix
index 0263925e..67b901c8 100644
--- a/nixos/home/desktop/wayland/waybar.nix
+++ b/nixos/home/desktop/wayland/waybar.nix
@@ -1,5 +1,9 @@
-{ ... }:
+{ pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    (nerdfonts.override { fonts = [ "FiraCode" ]; })
+    bluez
+  ];
   xdg.configFile."waybar".source = ./config/waybar;
   programs.waybar.enable = true;
 }
diff --git a/nixos/home/desktop/xorg/common.nix b/nixos/home/desktop/xorg/common.nix
index 0b0f1ff5..2eaac95e 100644
--- a/nixos/home/desktop/xorg/common.nix
+++ b/nixos/home/desktop/xorg/common.nix
@@ -1,2 +1,5 @@
 { ... }:
-{ xsession.enable = true; }
+{
+  xsession.enable = true;
+  programs.keychain.enableXsessionIntegration = true;
+}
diff --git a/nixos/home/desktop/xorg/xresources.nix b/nixos/home/desktop/xorg/xresources.nix
index 1218d453..dbc66a90 100644
--- a/nixos/home/desktop/xorg/xresources.nix
+++ b/nixos/home/desktop/xorg/xresources.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  imports = [ ./common.nix ];
   xresources.extraConfig = builtins.readFile
     (
       pkgs.fetchFromGitHub
diff --git a/nixos/home/env/shell/bash.nix b/nixos/home/env/bash.nix
similarity index 73%
rename from nixos/home/env/shell/bash.nix
rename to nixos/home/env/bash.nix
index 431df53b..7ab50666 100644
--- a/nixos/home/env/shell/bash.nix
+++ b/nixos/home/env/bash.nix
@@ -11,4 +11,6 @@
       xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized";
     };
   };
+  programs.keychain.enableBashIntegration = true;
+  programs.starship.enableBashIntegration = true;
 }
diff --git a/nixos/home/env/bat.nix b/nixos/home/env/bat.nix
index 565af861..28eb0838 100644
--- a/nixos/home/env/bat.nix
+++ b/nixos/home/env/bat.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [ ../env/fonts];
   programs.bat = {
     enable = true;
     config = {
diff --git a/nixos/home/env/direnv.nix b/nixos/home/env/direnv.nix
index b3de9421..3288fcc3 100644
--- a/nixos/home/env/direnv.nix
+++ b/nixos/home/env/direnv.nix
@@ -1,10 +1,4 @@
-{...}:
+{ ... }:
 {
-  imports = [ ./shell ];
-  programs.direnv = {
-    enable = true;
-    #enableBashIntegration = true;
-    #enableZshIntegration = true;
-    #enableFishIntegration = true;
-  };
+  programs.direnv.enable = true;
 }
diff --git a/nixos/home/env/shell/fish.nix b/nixos/home/env/fish.nix
similarity index 83%
rename from nixos/home/env/shell/fish.nix
rename to nixos/home/env/fish.nix
index eb2f54a0..7f1fa061 100644
--- a/nixos/home/env/shell/fish.nix
+++ b/nixos/home/env/fish.nix
@@ -14,4 +14,6 @@
       rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server ~/.nvim.sock";
     };
   };
+  programs.keychain.enableFishIntegration = true;
+  programs.starship.enableFishIntegration = true;
 }
diff --git a/nixos/home/env/fonts/firacode.nix b/nixos/home/env/fonts/firacode.nix
deleted file mode 100644
index 5f41458c..00000000
--- a/nixos/home/env/fonts/firacode.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    fira-code
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-  ];
-}
diff --git a/nixos/home/env/fonts/iosevka.nix b/nixos/home/env/fonts/iosevka.nix
deleted file mode 100644
index 4ec67414..00000000
--- a/nixos/home/env/fonts/iosevka.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    iosevka
-    (nerdfonts.override { fonts = [ "Iosevka" ]; })
-  ];
-}
diff --git a/nixos/home/env/keychain.nix b/nixos/home/env/keychain.nix
index 6ebcf7db..52a79aeb 100644
--- a/nixos/home/env/keychain.nix
+++ b/nixos/home/env/keychain.nix
@@ -1,12 +1,7 @@
 { ... }:
 {
-  imports = [ ./shell ];
   programs.keychain = {
     enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    enableXsessionIntegration = true;
     extraFlags = [
       "--quiet"
       "--ignore-missing"
diff --git a/nixos/home/env/nixpkgs.nix b/nixos/home/env/nixpkgs.nix
deleted file mode 100644
index ce863af9..00000000
--- a/nixos/home/env/nixpkgs.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  nixpkgs.config.allowUnfree = true;
-}
diff --git a/nixos/home/env/shell/default.nix b/nixos/home/env/shell/default.nix
deleted file mode 100644
index be00e6af..00000000
--- a/nixos/home/env/shell/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./bash.nix
-    ./zsh.nix
-    ./fish.nix
-  ];
-}
diff --git a/nixos/home/env/ssh.nix b/nixos/home/env/ssh.nix
index e7ef934c..cf08de8a 100644
--- a/nixos/home/env/ssh.nix
+++ b/nixos/home/env/ssh.nix
@@ -1,6 +1,5 @@
 { ... }:
 {
-  imports = [ ./shell ];
   programs.ssh = {
     enable = true;
     includes = [ "config.d/*" ];
diff --git a/nixos/home/env/starship.nix b/nixos/home/env/starship.nix
index 0aefeccb..2c36d8f5 100644
--- a/nixos/home/env/starship.nix
+++ b/nixos/home/env/starship.nix
@@ -1,11 +1,6 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [ ./shell ];
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   xdg.configFile."starship.toml".source = ./config/starship.toml;
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-  };
+  programs.starship.enable = true;
 }
diff --git a/nixos/home/env/shell/zsh.nix b/nixos/home/env/zsh.nix
similarity index 82%
rename from nixos/home/env/shell/zsh.nix
rename to nixos/home/env/zsh.nix
index 133a495c..d567859b 100644
--- a/nixos/home/env/shell/zsh.nix
+++ b/nixos/home/env/zsh.nix
@@ -17,4 +17,6 @@
       path = "${config.xdg.dataHome}/zsh/history";
     };
   };
+  programs.keychain.enableZshIntegration = true;
+  programs.starship.enableZshIntegration = true;
 }
diff --git a/nixos/home/terminal/foot.nix b/nixos/home/terminal/foot.nix
index 337c9f7c..601bc262 100644
--- a/nixos/home/terminal/foot.nix
+++ b/nixos/home/terminal/foot.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   programs.foot = {
     enable = true;
     settings = {
@@ -9,9 +9,6 @@
         font = "FiraCode Nerd Font:size=12";
         dpi-aware = "yes";
       };
-      mouse = {
-        hide-when-typing = true;
-      };
       colors = {
         # Catppuccin Macchiato
         foreground = "cad3f5"; # Text
diff --git a/nixos/home/terminal/urxvt.nix b/nixos/home/terminal/urxvt.nix
index c2ce0bf0..fe480bea 100644
--- a/nixos/home/terminal/urxvt.nix
+++ b/nixos/home/terminal/urxvt.nix
@@ -1,11 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [ ../env/fonts ];
+  home.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
   programs.urxvt = {
     enable = true;
-    fonts = [
-      "xft:FiraCode Nerd Font Mono:pixelsize=16"
-      "xft:Iosevka Nerd Font Mono:pixelsize=16"
-    ];
+    fonts = [ "xft:FiraCode Nerd Font Mono:pixelsize=16" ];
   };
 }