diff --git a/home/default.nix b/home/default.nix
index 4d2a274..f4743d9 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -10,6 +10,7 @@
     ./gtk
     ./mpv
     ./shell
+    ./thunderbird
     ./vscode
     ./wayland
     ./xdg
diff --git a/home/packages.nix b/home/packages.nix
index ccc321d..a38e7c6 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -17,14 +17,12 @@
     distrobox # docker utils
     docker-compose # docker compose
     duf # replacement for df
-    feh # image viewer
     gnome.nautilus # file explorer
+    gnome.seahorse # key manager
     grim # screenshot utils
     jaq # (fast) json utils
     jmtpfs # for Android MTP
     keepassxc # password manager
-    micro # text editor
-    mpv # video viewer
     nil # nix language server
     obsidian # second brain journalling
     pamixer # volume mixer cli
@@ -35,8 +33,6 @@
     slurp # region selector
     socat # socket cat
     sysz # better systemctl
-    thunderbird # mail client
-    tmux # terminal multiplexer
     wl-clipboard # clipboard utils
     xdg-utils
   ];
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 7649e35..6f4e8b9 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -6,6 +6,9 @@
     ./direnv.nix
     ./exa.nix
     ./git.nix
-    ./zsh.nix
+    ./micro.nix
+    # ./ssh.nix
+    ./tmux.nix
+    ./fish.nix
   ];
 }