From 7e4b0fe70d4589c0f55c27afcb16c0ac241ba2d1 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 4 Oct 2024 10:20:27 -0400
Subject: [PATCH] jellyfin fix

---
 .gitattributes                           |   1 +
 configuration.nix                        |  22 +++++++++++++++++++++-
 flake.lock                               |   6 +++---
 secrets/Jellyfin.Plugin.ListenBrainz.xml | Bin 0 -> 1410 bytes
 services/jellyfin.nix                    |   7 +++++++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 secrets/Jellyfin.Plugin.ListenBrainz.xml

diff --git a/.gitattributes b/.gitattributes
index 4c9ff84..021d814 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@ secrets/murmur_password filter=git-crypt diff=git-crypt
 secrets/hashedPass filter=git-crypt diff=git-crypt
 secrets/mullvad.nix filter=git-crypt diff=git-crypt
 secrets/minecraft-whitelist.nix filter=git-crypt diff=git-crypt
+secrets/Jellyfin.Plugin.ListenBrainz.xml filter=git-crypt diff=git-crypt
diff --git a/configuration.nix b/configuration.nix
index 2dc3981..9ea7519 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -62,6 +62,11 @@
       compressor = "zstd";
       compressorArgs = [ "-19" ];
     };
+    kernelModules = [
+      # kernel module for case fan control
+      "nct6775"
+    ];
+
   };
 
   environment.etc = {
@@ -123,7 +128,7 @@
 
     (pkgs.writeScriptBin "mc-attach" ''
       #!/bin/sh
-      tmux -S /run/minecraft/${service_configs.minecraft.server_name}.sock attach
+      ${pkgs.tmux}/bin/tmux -S /run/minecraft/${service_configs.minecraft.server_name}.sock attach
     '')
 
     (pkgs.writeScriptBin "disk-smart-test" ''
@@ -178,6 +183,21 @@
   services.udev.packages = [ pkgs.openrgb-with-all-plugins ];
   hardware.i2c.enable = true;
 
+  hardware.fancontrol = {
+    enable = true;
+    config = ''
+      INTERVAL=10
+      DEVPATH=hwmon0=devices/pci0000:00/0000:00:18.3 hwmon1=devices/platform/nct6775.656
+      DEVNAME=hwmon0=zenpower hwmon1=nct6798
+      FCTEMPS=hwmon1/pwm4=hwmon0/temp1_input hwmon1/pwm2=hwmon0/temp1_input
+      FCFANS=hwmon1/pwm4=hwmon1/fan4_input hwmon1/pwm2=hwmon1/fan2_input
+      MINTEMP=hwmon1/pwm4=20 hwmon1/pwm2=20
+      MAXTEMP=hwmon1/pwm4=70 hwmon1/pwm2=70
+      MINSTART=hwmon1/pwm4=150 hwmon1/pwm2=150
+      MINSTOP=hwmon1/pwm4=100 hwmon1/pwm2=100
+    '';
+  };
+
   networking = {
     nameservers = [
       "1.1.1.1"
diff --git a/flake.lock b/flake.lock
index 5bdf9ae..673af12 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727747697,
-        "narHash": "sha256-bNZ4ykMpxyTLrPsctiDwe5d69vafvIbNTbzbWfd2CH4=",
+        "lastModified": 1728006367,
+        "narHash": "sha256-Bdf5twzinaacnn1JBogvxq0S8Ytm+25mWD2cfJ7fvpo=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "30af58cedcc444da772a73286e16287f94a9fef1",
+        "rev": "a3a7888df1b87bdababfd9f0b00b574ee4c2e204",
         "type": "github"
       },
       "original": {
diff --git a/secrets/Jellyfin.Plugin.ListenBrainz.xml b/secrets/Jellyfin.Plugin.ListenBrainz.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5a3780e9f55ea9b95f3623d1fea60cac62d427d
GIT binary patch
literal 1410
zcmZQ@_Y83kiVO&0NXUpfQ=WURgM(`=`{o@Fx5nuFJG?!CIXHmnbdkb~tJQATIK2&*
z2BcJ)u<SC~8$5&iaC^3pa^~8T$u^uur8#f+eOu3Qr+EIJ3p`h9c2%wLJyCb4UC)fS
z>{w;eyY<~Gt{83=2<Si9bUG(P&1NCr=Fi11nEFm#*~x5k?p*VEF~)|4?!L#}``_Mv
z)A#pKLHm=K-#fB4-iUcK=RuwB#LCn48#FfMKX=n*&op-GVm%#ik+CRkWhzUtkBG(3
zb;pb&;!08qi$l&&xc=%_&NSgS`kQ|<?%Di#Wq`=VHntT%KTm!2cTv{a^j$Zu#Z7WD
z3*Ek-aZe#<jN-N>dN#>+n=bb5m72I<l4U<%^Z!P@hxKmyO7q;Opa0OJF?CbY38ou~
zRw15CuUh3y)%iE=$eRN{TpvHJ+h5B6e_zn&=>ZXMER8NTHH5xelo{f8o<FxOVQqSK
z^6RBZpObyNcArx*eBzk-KILuVgE<$&zW+5}kQdE)U+R4kcg==-mbZ6bun36>zV_gw
z#8szc@1MD9uh_hoYOh-+w{a%dx^~8;hRpXIBqzj_Y43HY&1syuyo>Yn)fclrahhap
zxbSY*fAg&@8{K_dH1=&U=uz3m@Mt4L!o-iSd$LQOSIz#lV}Zr1qyJyc*idkfS(J6x
zLBGg@IdQ!lWuH4=nQXKv40^cql;juIr8gez{dL@WU)kEDYd0zEVLlgn=6JBvni*{;
zH{aN@=jxN1tqL5!HY7-&Wc>MA^kJpKmEz~w&Y^mV^A}uC6A7%!%sK48X$2>HUYYIQ
z)p0vJjvV{Vq&8Qn`$hIM^Cix27T+sPew}44kQ)Ac+qs`UuktwinP#S_Z<}y+;>)$1
zm;P?Lz{b4IfAN}7Lu<oL0{tc>vpzjb**klw^ZgrnA19n&yQ=DK;XmDz&d+{4f2Lx+
za$5YM1=Cj_T2@y%S#Y)O)5%(Mr|F5^eBcn%vgoao+IH>R)AHU3t<d_J+np&_A--?(
ziH}p|UU_*LJLS3<%n4ule%(T~LmxSxJgx37^|D{Js^XXKx*WqJrMvHZnmXZW!m3#*
zoK_tVIHUKiJJM@?-sXhgC(bF)g71hk_^9rmP`zmJnv1*V&A83(l+$<j-r7rNC$tDP
z)-QCtU6{P1=Cep#!kT98HtXIW7RtwZW@YS}v+yPNZ_T5BW^<UB2WNR-7TL^N^5XD;
z+s$u2_Q@(AS)`J=fa{`h(N(si&rTiQbmZ%!kBfJnc@Vs4=}xOBJ@)x5uU~8^Ss%Lo
z<+Q(BCayG&y7q#x{$@kWv<v)Kovmhj8y(L&^To+SbasfpvhgX$dp)M5OpE@X>%R2I
z<d4LkMSd68tge|UQst~4Wux|B$)<Rj(C{7(hnhoyA9floO3=xiG9&W3Zkghis{YD(
zryeMWEb}<q`)a`pwE~g&jlVKhm+LFXC#tY2qzEMYw}&0FR#R3|o03+&X@}h2d#OBe
zE?FO>&NF}33%v1TmO$EJo(S=sSDU=oItC@O{&tM{u;x2MdSLvK$p%YT3f|{0dH=zI
zkF8?yjECYc-TFDjXUtT%B=xSK%+%uR&pRf6nk~N1`=#}mQSzPB*$)T84;GbN`|PAH
zKIduLg1ZVHGxTIv^~yY)XL3l_%=h7WqgPi;Ra8_r2hDe8Q7^y1IC-&sMa&YlV@8JG
zZ&XaY^Z3rIhQg>zsY*}SX1%?ABHPWbSo(JAqVPJEG*gL{Q}QD(?{5*$eHQh5{S}VI
z3%2d+`my26J6WYS|Nbps@l!&HCsc2a6~FtfOBdEWXfSxWS9FV>c<Z7T&39)X?3<Xl
zY{G{7Up9T*^wwbpSD~W&-PKJ$56<l8Z~8SO>Gz|x3B5&Ig_gNZ@m;Un948gcGMlG(
tzuobW69M<~T&B(pG~MWT;+(Qd^qcFuZ*<JOQpI?G`-zW_l`iem1OWDx*@OT9

literal 0
HcmV?d00001

diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index c602ce7..b1b6072 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -2,6 +2,7 @@
   pkgs,
   config,
   service_configs,
+  lib,
   ...
 }:
 {
@@ -26,4 +27,10 @@
     "video"
     "render"
   ];
+
+  # https://github.com/lyarenei/jellyfin-plugin-listenbrainz/issues/107
+  system.activationScripts.jellyfinListenBrain.text = ''
+    cp -v /etc/nixos/secrets/Jellyfin.Plugin.ListenBrainz.xml ${service_configs.jellyfin.data_dir}/plugins/configurations/
+    chown ${config.services.jellyfin.user}:${config.services.jellyfin.group} ${service_configs.jellyfin.data_dir}/plugins/configurations/Jellyfin.Plugin.ListenBrainz.xml
+  '';
 }