System/Servenix: Update music NFS mount

home/modules/beets/default.nix

@@ -50,7 +50,8 @@ in {
           "edit" # edit metadata in text editor
           "fetchart" # pickup local cover art or search online
           "fish" # beet fish generates ~/.config/fish/completions file
-          "lyrics" # fetch song lyrics
+          # "lyrics" # fetch song lyrics
+          "musicbrainz" # auto tagger data source
           "replaygain" # write replaygain tags for automatic loudness adjustments
         ];
 
@@ -59,10 +60,10 @@ in {
           sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
         };
 
-        lyrics = {
-          auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc
-          synced = "yes"; # prefer synced lyrics if provided
-        };
+        # lyrics = {
+        #   auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc
+        #   synced = "yes"; # prefer synced lyrics if provided
+        # };
 
         replaygain = {
           auto = "yes"; # analyze on import automatically

system/default.nix

@@ -143,7 +143,7 @@ with mylib.networking; {
 
   # Bootloader/Kernel stuff
   boot = {
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages;
     kernelParams = ["mitigations=off"]; # I don't care
 
     # Make /tmp volatile

system/nixinator/default.nix

@@ -104,7 +104,8 @@
   };
 
   boot = {
-    # kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
+    # kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
     # kernelParams = [ "quiet" ];
     # plymouth.enable = true;

system/nixinator/hardware-configuration.nix

@@ -35,6 +35,10 @@
       "vfat"
     ];
 
+    supportedFilesystems = [
+      # "zfs" # Probably requires LTS kernel + networking.hostId
+    ];
+
     kernelModules = [
       "kvm-amd"
       "sg" # Blu-Ray drive
@@ -60,6 +64,9 @@
     ];
   };
 
+  # Required for supportedFilesystems = ["zfs"];, so pools don't get imported on the wrong machine
+  # networking.hostId = "611e6afb";
+
   fileSystems = {
     # NOTE: Some filesystems are managed by disko (see ./disks.nix)
 
@@ -82,23 +89,22 @@
     # Using  NFS over TCP or increasing the value of the retrans option may mitigate
     # some of the risks of using the soft option.
 
-    "/home/${username}/Movies" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Shows" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
-
-    "/home/${username}/Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
-      fsType = "nfs";
-      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    };
+    # TODO: New HDDs
+    # "/home/${username}/Movies" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
+    # "/home/${username}/Shows" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
+    # "/home/${username}/Music" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    # };
 
     "/home/${username}/Restic" = {
       device = "192.168.86.15:/volume1/NixinatorPersistence";

system/servenix/hardware-configuration.nix

@@ -46,20 +46,21 @@
 
     # SG Exos Mirror Shares
 
-    "/media/Movie" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-      fsType = "nfs";
-      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
-    };
-
-    "/media/Show" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-      fsType = "nfs";
-      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
-    };
+    # TODO: New HDDs
+    # "/media/Movie" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    # };
+    # "/media/Show" = {
+    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+    #   fsType = "nfs";
+    #   options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    # };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+      # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+      device = "192.168.86.20:/mnt/Music/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };

system/services/jellyfin.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  jellyfinVersion = "10.10.7";
+  jellyfinVersion = "10.11.2";
 in {
   virtualisation.oci-containers.containers = {
     jellyfin = {

system/services/nginx-proxy-manager.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  nginxVersion = "2.12.6";
+  nginxVersion = "2.13.1";
 in {
   virtualisation.oci-containers.containers = {
     nginx-proxy-manager = {

system/services/portainer-agent.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   # Match this with the portainer-ce version
-  portainerVersion = "2.31.3";
+  portainerVersion = "2.33.3";
 in {
   # Use the agent to connect clients to a main portainer instance
   virtualisation.oci-containers.containers = {

system/services/portainer.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   # Match this with the portainer agent version
-  portainerVersion = "2.31.3";
+  portainerVersion = "2.33.3";
 in {
   virtualisation.oci-containers.containers = {
     portainer = {