From c7b7d2a758494e6625c0c4ea34d069dbdd689c79 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Sat, 11 Oct 2025 11:20:05 +0530
Subject: [PATCH] refactor(hyprland): update monitor configuration and
 rendering settings feat(apps): enable jellyflix and add jellyfin-mpv-shim and
 jellytui fix(caddy): update dependencies for sops service on ryu and tsuba

---
 home/apps/default.nix          |  2 +-
 home/apps/jellyflix.nix        |  4 +++-
 home/services/hyprland.nix     | 36 ++++++++++++++++++++++++++++------
 nixos/ryu/services/caddy.nix   |  4 ++--
 nixos/tsuba/services/caddy.nix |  1 +
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/home/apps/default.nix b/home/apps/default.nix
index 874ef2c7..4e8abfcd 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -16,7 +16,7 @@ lib.optionalAttrs device.hasGui {
     # ./gimp.nix
     ./guitarix.nix
     ./hyprpicker.nix
-    # ./jellyflix.nix
+    ./jellyflix.nix
     ./kicad.nix
     ./kitty.nix
     ./mpv.nix
diff --git a/home/apps/jellyflix.nix b/home/apps/jellyflix.nix
index 067accc4..78c957e9 100644
--- a/home/apps/jellyflix.nix
+++ b/home/apps/jellyflix.nix
@@ -4,7 +4,9 @@
   ...
 }: {
   home.packages = lib.optionals pkgs.stdenv.isLinux [
-    pkgs.jellyflix
+    # pkgs.jellyflix
     # pkgs.jellyfin-media-player
+    pkgs.jellyfin-mpv-shim
+    pkgs.jellytui
   ];
 }
diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix
index 739f0efd..172ad966 100644
--- a/home/services/hyprland.nix
+++ b/home/services/hyprland.nix
@@ -52,12 +52,36 @@
 
     settings = {
       source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
-      # "render:cm_fs_passthrough" = 1;
-      monitor = [
-        # "${device.monitors.primary},    2560x1440@360,          0x0,     1, transform, 0, bitdepth, 10, cm, hdr, sdrbrightness, 1.1, sdrsaturation, 1.2"
-        "${device.monitors.primary},    2560x1440@360,          0x0,     1, transform, 0"
-        "${device.monitors.secondary},  2560x1440@170,  -1440x-1120,     1, transform, 1"
-        "${device.monitors.tertiary},   2560x1440@170,   2560x-1120,     1, transform, 3"
+      render = {
+        cm_fs_passthrough = 1;
+        cm_auto_hdr = 1;
+      };
+      monitorv2 = [
+        {
+          output = device.monitors.primary;
+          mode = "2560x1440@360";
+          position = "0x0";
+          scale = 1;
+          transform = 0;
+          # bitdepth = 10;
+          # cm = "hdr";
+          # sdrbrightness = 1.1;
+          # sdrsaturation = 1.2;
+        }
+        {
+          output = device.monitors.secondary;
+          mode = "2560x1440@170";
+          position = "-1440x-1120";
+          scale = 1;
+          transform = 1;
+        }
+        {
+          output = device.monitors.tertiary;
+          mode = "2560x1440@170";
+          position = "2560x-1120";
+          scale = 1;
+          transform = 3;
+        }
       ];
 
       input = {
diff --git a/nixos/ryu/services/caddy.nix b/nixos/ryu/services/caddy.nix
index 28bb2937..b3c210d0 100644
--- a/nixos/ryu/services/caddy.nix
+++ b/nixos/ryu/services/caddy.nix
@@ -36,8 +36,8 @@
   systemd.services.caddy = {
     serviceConfig = {
       EnvironmentFile = config.sops.templates."HETZNER_API_KEY.env".path;
-      Requires = ["sops.service"];
-      After = ["sops.service"];
+      Requires = ["sops-install-secrets.service"];
+      After = ["sops-install-secrets.service"];
     };
   };
 }
diff --git a/nixos/tsuba/services/caddy.nix b/nixos/tsuba/services/caddy.nix
index 86ef860b..71289f81 100644
--- a/nixos/tsuba/services/caddy.nix
+++ b/nixos/tsuba/services/caddy.nix
@@ -40,6 +40,7 @@
   };
   systemd.services.caddy = {
     serviceConfig = {
+      After = ["sops-install-secrets.service"];
       EnvironmentFile = config.sops.templates."HETZNER_API_KEY.env".path;
     };
   };