refactor(treewide): clean-up, flatten, rework module system

home/modules/desktop/media/image/default.nix

@@ -1,13 +1,5 @@
-{ lib, ... }:
 {
   imports = [
-    ./imv
+    ./imv.nix
   ];
-
-  options.ooknet.desktop.media.image = {
-    imv = {
-      enable = lib.mkEnableOption "Enable imv image viewer";
-    };
-  };
-
 }

home/modules/desktop/media/image/imv.nix

@@ -1,9 +1,12 @@
 { lib, config, ... }:
+
 let
-  cfg = config.ooknet.desktop.media.image.imv;
+  inherit (lib) mkIf;
+  cfg = config.ooknet.media.image.imv;
 in
+
 {
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     programs = {
       imv = {
         enable = true;

home/modules/desktop/media/music/default.nix

@@ -1,17 +1,6 @@
-{ lib, ... }:
 {
   imports = [
     #./spotify --- still needs to be implemented
-    ./easyeffects
     ./tui
   ];
-
-  options.ooknet.desktop.media.music = {
-    tui = {
-      enable = lib.mkEnableOption "Enable tui music";
-    };
-    spotify = {
-      enable = lib.mkEnableOption "Enable spotify";
-    };
-  };
 }

home/modules/desktop/media/music/easyeffects/default.nix

@@ -1,15 +0,0 @@
-{lib, config, ... }:
-
-let
-  cfg = config.ooknet.desktop.media.music.easyeffects;
-  inherit (lib) mkIf mkEnableOption;
-in
-
-{
-  options.ooknet.desktop.media.music.easyeffects.enable = mkEnableOption "Enable easy effects home module";
-  config = mkIf cfg.enable {
-    services.easyeffects = {
-      enable = true;
-    };
-  };
-}

home/modules/desktop/media/music/tui.nix

@@ -2,8 +2,13 @@
 
 let
   inherit (config.colorscheme) palette;
+  inherit (lib) mkIf;
+
   cfg = config.ooknet.desktop.media.music.tui;
-  zellij = config.ooknet.console.multiplexer.zellij;
+  zellij = config.ooknet.multiplexer.zellij;
+  multiplexer= config.ooknet.console.multiplexer;
+
+  # removed image support because it was causing issues with zellij
   spotify-cli = pkgs.spotify-player.override {
     withImage = false;
     withSixel = false;
@@ -11,15 +16,14 @@ let
 in
 
 {
-
- 
-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       termusic
       spotify-cli
       alsa-utils
       mpv
     ];
+
     programs.cava = {
       enable = true;
       settings = {
@@ -35,6 +39,7 @@ in
         };
       };
     };
+
     xdg.configFile."spotify-player/app.toml".text =  /* toml */ ''
       theme = "default"
       client_id = "fc4c3656d7cc4a7ea70c6080965f8b1a"
@@ -68,7 +73,7 @@ in
       normalization = false
     '';
     
-    xdg.configFile."zellij/layouts/music.kdl".text = lib.mkIf zellij.enable /* kdl */ ''
+    xdg.configFile."zellij/layouts/music.kdl".text = mkIf (zellij.enable || multiplexer == "zellij") /* kdl */ ''
       layout {
       default_tab_template {
           pane size=2 borderless=true {
@@ -114,7 +119,7 @@ in
           }
       }
     '';
-    home.shellAliases = lib.mkIf zellij.enable {
+    home.shellAliases = mkIf (zellij.enable || multiplexer == "zellij") {
       zjm = "zellij --layout music";
     };
   };

home/modules/desktop/media/video/default.nix

@@ -1,20 +1,7 @@
-{ lib, ... }:
 {
   imports = [
-    ./youtube
-    ./jellyfin
-    ./mpv
+    ./youtube.nix
+    ./jellyfin-player.nix
+    ./mpv.nix
   ];
-  
-  options.ooknet.desktop.media.video = {
-    mpv = {
-      enable = lib.mkEnableOption "Enable mpv video player";
-    };
-    youtube = {
-      enable = lib.mkEnableOption "Enable youtube tui player";
-    };
-    jellyfin = {
-      enable = lib.mkEnableOption "Enable jellyifn media player";
-    };
-  };
 }

home/modules/desktop/media/video/jellyfin-player.nix

@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.media.video.jellyfinPlayer;
+in
+
+{
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.jellyfin-media-player ];
+  };
+}

home/modules/desktop/media/video/jellyfin/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, lib, config, ... }:
-let
-  cfg = config.ooknet.desktop.media.video.jellyfin;
-in
-{
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ jellyfin-media-player ];
-  };
-}

home/modules/desktop/media/video/mpv.nix

@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.media.video.mpv;
+in
+
+{
+  config = mkIf cfg.enable {
+    programs.mpv = {
+      enable = true;
+    };
+  };
+}

home/modules/desktop/media/video/mpv/default.nix

@@ -1,13 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-let
-  cfg = config.ooknet.desktop.media.video.mpv;
-in
-{
-  config = {
-    programs.mpv = lib.mkIf cfg.enable {
-      enable = true;
-    };
-    home.packages = [ pkgs.ffmpeg ];
-  };
-}

home/modules/desktop/media/video/youtube.nix

@@ -0,0 +1,15 @@
+{ lib, config, pkgs, ...}:
+
+let
+  inherit (lib) mkIf;
+  cfg = config.ooknet.media.video.youtube;
+in
+
+{
+  config = mkIf cfg.enable {
+    home.packages = [ pkgs.youtube-tui ];
+    programs.yt-dlp = {
+      enable = true;
+    };
+  };
+}

home/modules/desktop/media/video/youtube/default.nix

@@ -1,12 +0,0 @@
-{ lib, config, pkgs, ...}:
-let
-  cfg = config.ooknet.desktop.media.video.youtube;
-in
-{
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ youtube-tui ];
-    programs.yt-dlp = {
-      enable = true;
-    };
-  };
-}