refactor(module): simplify modules and integrate sops-nix

2 files changed, 8 insertions, 34 deletions

diff --git a/modules/home/media/jellyfin-mpv-shim/default.nix b/modules/home/media/jellyfin-mpv-shim/default.nix
index 53826f6..679a1c6 100644
--- a/modules/home/media/jellyfin-mpv-shim/default.nix
+++ b/modules/home/media/jellyfin-mpv-shim/default.nix
@@ -1,32 +1,11 @@
 { config, lib, ... }:
 let
   cfg = config.nx.media.jellyfin-mpv-shim;
-  # Reference your custom mpv options
-  mpvOpt = config.nx.media.mpv;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-    types
-    optionalAttrs
-    ;
+  inherit (lib) mkEnableOption mkIf optionalAttrs;
 in
 {
   options.nx.media.jellyfin-mpv-shim = {
     enable = mkEnableOption "Jellyfin MPV Shim";
-    name = mkOption {
-      description = "Name of player";
-      type = types.str;
-      default = "mpv-shim";
-    };
-    hdrExpansion = mkOption {
-      type = types.bool;
-      default = mpvOpt.hdrExpansion;
-    };
-    targetPeak = mkOption {
-      type = types.int;
-      default = mpvOpt.targetPeak;
-    };
   };
 
   config = mkIf cfg.enable {
@@ -37,16 +16,16 @@ in
     services.jellyfin-mpv-shim = {
       enable = true;
       settings = {
-        player_name = cfg.name;
+        player_name = "mpv-shim";
         allow_transcode_to_h256 = true;
       };
       mpvConfig = {
         vo = "gpu-next";
         gpu-api = "vulkan";
         target-colorspace-hint = "yes";
-        target-peak = cfg.targetPeak;
+        target-peak = 500;
       }
-      // (optionalAttrs cfg.hdrExpansion {
+      // (optionalAttrs false {
         target-trc = "pq";
         target-prim = "bt.2020";
         #target-peak = 406;
@@ -56,4 +35,4 @@ in
       });
     };
   };
-}
+}
\ No newline at end of file
diff --git a/modules/home/media/nixcord/default.nix b/modules/home/media/nixcord/default.nix
index 8f3b665..c7f2b4b 100644
--- a/modules/home/media/nixcord/default.nix
+++ b/modules/home/media/nixcord/default.nix
@@ -5,16 +5,11 @@
 }:
 let
   cfg = config.nx.media.nixcord;
-  inherit (lib) mkEnableOption mkOption types mkIf;
+  inherit (lib) mkEnableOption mkIf;
 in
 {
   options.nx.media.nixcord = {
     enable = mkEnableOption "nixcord and setup";
-    frameless = mkOption {
-      description = "Make discord frameless";
-      type = types.bool;
-      default = true;
-    };
   };
   config = mkIf cfg.enable {
     programs.nixcord = {
@@ -23,7 +18,7 @@ in
         themeLinks = [
           "https://refact0r.github.io/system24/theme/system24.theme.css"
         ];
-        frameless = cfg.frameless;
+        frameless = true;
         plugins = {
           alwaysAnimate.enable = false;
           imageLink.enable = true;
@@ -33,4 +28,4 @@ in
       };
     };
   };
-}
+}
\ No newline at end of file