home/zsh/default.nix

@@ -3,10 +3,8 @@ let
   cfg = config.my.home.zsh;
 in
 {
-  options.my.home.zsh = with lib; {
-    enable = my.mkDisableOption "zsh configuration";
-
-    launchTmux = mkEnableOption "auto launch tmux at shell start";
+  options.my.home.zsh = with lib.my; {
+    enable = mkDisableOption "zsh configuration";
   };
 
   config = lib.mkIf cfg.enable {
@@ -46,16 +44,14 @@ in
       defaultKeymap = "emacs";
 
       # Make those happen early to avoid doing double the work
-      initExtraFirst = ''
-        ${
-          lib.optionalString cfg.launchTmux ''
-            # Launch tmux unless already inside one
-            if [ -z "$TMUX" ]; then
-              exec tmux new-session
-            fi
-          ''
-        }
-      '';
+      initExtraFirst =
+        lib.optionalString config.my.home.tmux.enable ''
+          # Launch tmux unless already inside one
+          if [ -z "$TMUX" ]; then
+            exec tmux new-session
+          fi
+        ''
+      ;
 
       initExtra = ''
         source ${./completion-styles.zsh}

machines/porthos/default.nix

@@ -5,7 +5,6 @@
   imports = [
     ./boot.nix
     ./hardware.nix
-    ./home.nix
     ./networking.nix
     ./services.nix
     ./users.nix

machines/porthos/home.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  my.home = {
-    # Always start a tmux session when opening a shell session
-    zsh.launchTmux = true;
-  };
-}