diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix
index 648f8677..55f95fd9 100644
--- a/nix/configurations/tungsten.nix
+++ b/nix/configurations/tungsten.nix
@@ -150,6 +150,8 @@ in
           ../homeModules/common/sioyek.nix
           ../homeModules/common/user-nixconf.nix
 
+          ../homeModules/extra/tmux-fish-integration.nix
+
           #
           # Extern modules
           #
diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix
index 1bda1ee3..2a516c2d 100644
--- a/nix/configurations/tungsten/home/programs.nix
+++ b/nix/configurations/tungsten/home/programs.nix
@@ -4,6 +4,12 @@
   config,
   ...
 }: {
+  home.sessionVariables = let
+    fishCfg = config.programs.fish;
+  in {
+    "SHELL" = lib.mkIf fishCfg.enable (lib.getExe fishCfg.package);
+  };
+
   imports = [
     #
     # CLI / TUI
@@ -18,18 +24,9 @@
         pkgs.bc
         pkgs.dig
         pkgs.hutils
-        # pkgs.miniserve
+        pkgs.miniserve
         pkgs.agenix
 
-        # pdf
-        # pkgs.poppler_utils # pdfseparate, pdfunite
-        # pkgs.easyscan
-
-        # fun
-        # pkgs.prop-solveur
-        # pkgs.hbrainfuck
-        # pkgs.lucky-commit
-
         # pretty tui tools
         pkgs.du-dust
         pkgs.tldr
@@ -41,7 +38,6 @@
 
         # nix tools
         pkgs.alejandra
-        # pkgs.nh
         pkgs.nix-output-monitor
         pkgs.nix-tree
         pkgs.nurl
@@ -59,10 +55,7 @@
 
         password-store.enable = true;
 
-        # ROCm support is needed for AMD GPU
-        # https://github.com/aristocratos/btop?tab=readme-ov-file#gpu-compatibility
         btop.enable = true;
-        btop.package = pkgs.btop-rocm;
 
         cmus.enable = true;
         ranger.enable = true;
@@ -74,20 +67,9 @@
     #
     {
       home.packages = [
-        # productivity / media
-        # pkgs.evolution
-        # pkgs.libreoffice
-        # pkgs.iamb
-        # pkgs.calibre
-        # pkgs.rawtherapee
-        # pkgs.digikam
-        # pkgs.gimp
         pkgs.vlc
         pkgs.nautilus
         pkgs.sushi # space bar previewer
-        # pkgs.blender
-        # pkgs.inkscape
-        # pkgs.aseprite
 
         # wm utilities
         pkgs.xbrightness