From fce1cc3634a825c2113ec6430ca76943de6d3223 Mon Sep 17 00:00:00 2001
From: Yan Lin <github@yanlincs.com>
Date: Wed, 11 Feb 2026 08:43:53 +0100
Subject: [PATCH] rearrange media modules

---
 hosts/darwin/home-default.nix                  | 2 +-
 hosts/darwin/imac/home.nix                     | 5 -----
 hosts/nixos/hs/home.nix                        | 2 +-
 hosts/nixos/hs/system.nix                      | 2 +-
 hosts/nixos/nfss/home.nix                      | 2 +-
 hosts/nixos/nfss/system.nix                    | 2 +-
 hosts/nixos/thinkpad/home.nix                  | 2 +-
 modules/{media-server.nix => media/server.nix} | 0
 modules/{media-process.nix => media/tool.nix}  | 0
 modules/{ => media}/yt-dlp.nix                 | 0
 modules/tmux.nix                               | 2 +-
 11 files changed, 7 insertions(+), 12 deletions(-)
 rename modules/{media-server.nix => media/server.nix} (100%)
 rename modules/{media-process.nix => media/tool.nix} (100%)
 rename modules/{ => media}/yt-dlp.nix (100%)

diff --git a/hosts/darwin/home-default.nix b/hosts/darwin/home-default.nix
index 127be90..440e970 100644
--- a/hosts/darwin/home-default.nix
+++ b/hosts/darwin/home-default.nix
@@ -16,7 +16,7 @@
     ../../modules/syncthing.nix
     ../../modules/claude-code.nix
     ../../modules/tex.nix
-    ../../modules/media-process.nix
+    ../../modules/media/tool.nix
     ../../modules/fonts.nix
     ../../modules/aerospace.nix
     ../../modules/peripheral/home.nix
diff --git a/hosts/darwin/imac/home.nix b/hosts/darwin/imac/home.nix
index ecaefc8..b9d9afb 100644
--- a/hosts/darwin/imac/home.nix
+++ b/hosts/darwin/imac/home.nix
@@ -3,11 +3,6 @@
 {
   imports = [
     ../home-default.nix
-    ../../../modules/yt-dlp.nix
   ];
 
-  programs.yt-dlp-custom = {
-    enable = true;
-    downloadDir = "~/Downloads";
-  };
 }
diff --git a/hosts/nixos/hs/home.nix b/hosts/nixos/hs/home.nix
index d89e7eb..9251846 100644
--- a/hosts/nixos/hs/home.nix
+++ b/hosts/nixos/hs/home.nix
@@ -6,7 +6,7 @@
     ../../../modules/syncthing.nix
     ../../../modules/tex.nix
     ../../../modules/schedule.nix
-    ../../../modules/yt-dlp.nix
+    ../../../modules/media/yt-dlp.nix
   ];
 
   services.scheduled-commands.aicloud-backup = {
diff --git a/hosts/nixos/hs/system.nix b/hosts/nixos/hs/system.nix
index a66e022..fb4e6fa 100644
--- a/hosts/nixos/hs/system.nix
+++ b/hosts/nixos/hs/system.nix
@@ -8,7 +8,7 @@
     ../../../modules/borg/client.nix
     ../../../modules/login-display.nix
     ../../../modules/samba.nix
-    ../../../modules/media-server.nix
+    ../../../modules/media/server.nix
   ];
 
   # GRUB bootloader with ZFS support
diff --git a/hosts/nixos/nfss/home.nix b/hosts/nixos/nfss/home.nix
index d0d3c15..10ec8e1 100644
--- a/hosts/nixos/nfss/home.nix
+++ b/hosts/nixos/nfss/home.nix
@@ -4,7 +4,7 @@
   imports = [
     ../home-default.nix
     ../../../modules/syncthing.nix
-    ../../../modules/media-process.nix
+    ../../../modules/media/tool.nix
   ];
 
 }
diff --git a/hosts/nixos/nfss/system.nix b/hosts/nixos/nfss/system.nix
index e525687..177d9cc 100644
--- a/hosts/nixos/nfss/system.nix
+++ b/hosts/nixos/nfss/system.nix
@@ -8,7 +8,7 @@
     ../../../modules/tailscale.nix
     ../../../modules/podman.nix
     ../../../modules/borg/client.nix
-    ../../../modules/media-server.nix
+    ../../../modules/media/server.nix
   ];
 
   # GRUB bootloader with ZFS support
diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix
index 605baa1..c147a7a 100644
--- a/hosts/nixos/thinkpad/home.nix
+++ b/hosts/nixos/thinkpad/home.nix
@@ -4,7 +4,7 @@
   imports = [
     ../home-default.nix
     ../../../modules/syncthing.nix
-    ../../../modules/media-process.nix
+    ../../../modules/media/tool.nix
     ../../../modules/schedule.nix
   ];
 
diff --git a/modules/media-server.nix b/modules/media/server.nix
similarity index 100%
rename from modules/media-server.nix
rename to modules/media/server.nix
diff --git a/modules/media-process.nix b/modules/media/tool.nix
similarity index 100%
rename from modules/media-process.nix
rename to modules/media/tool.nix
diff --git a/modules/yt-dlp.nix b/modules/media/yt-dlp.nix
similarity index 100%
rename from modules/yt-dlp.nix
rename to modules/media/yt-dlp.nix
diff --git a/modules/tmux.nix b/modules/tmux.nix
index d2ffd1d..60af25d 100644
--- a/modules/tmux.nix
+++ b/modules/tmux.nix
@@ -69,7 +69,7 @@ in
       set -g status-left-length 40
       set -g status-right-length 50
       set -g status-left '#{?client_prefix,#[bg=#fb4934],#[bg=#a89984]}#[fg=#282828] #S #[bg=#282828] '
-      set -g status-right '#(${continuumSaveScript})#[bg=#282828]#[fg=#ebdbb2] #{=20:#{b:pane_current_path}} #{?SSH_CLIENT,#[bg=#fabd2f],#[bg=#a89984]}#[fg=#282828]#{?pane_in_mode, [COPY],} #H | %H:%M '
+      set -g status-right '#(${continuumSaveScript})#[bg=#282828]#[fg=#ebdbb2] #{=20:#{b:pane_current_path}} #{?SSH_CLIENT,#[bg=#fabd2f],#[bg=#a89984]}#[fg=#282828]#{?pane_in_mode, [COPY],}#{?window_zoomed_flag, [Z],} #H | %H:%M '
       
       # Window status format
       set -g window-status-format ' #I:#W '