fix

hosts/desktopnix/fs.nix

@@ -13,7 +13,7 @@
           format = "gpt";
           partitions = [
             (partEfi "boot" "0%" "2GiB")
-            (partSwap "swap" "2GiB" "18GiB")
+            #(partSwap "swap" "2GiB" "18GiB")
             (partLuksZfs "m2-ssd" "rpool" "18GiB" "100%")
           ];
         };

hosts/elisabeth/guests.nix

@@ -65,7 +65,7 @@ in {
       servers."${ipOf "immich"}:2283" = {};
 
       extraConfig = ''
-        zone gitea 64k ;
+        zone immich 64k ;
         keepalive 5 ;
       '';
     };
@@ -77,7 +77,7 @@ in {
         proxyWebsockets = true;
       };
       extraConfig = ''
-        client_max_body_size 1G ;
+        client_max_body_size 5G ;
       '';
     };
 

modules/services/adguardhome.nix

@@ -32,6 +32,7 @@
       user_rules = [
         "||adguardhome.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnetv4}"
         "||nc.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnetv4}"
+        "||immich.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnetv4}"
         "||fritz.box^$dnsrewrite=${lib.net.cidr.host 1 config.secrets.secrets.global.net.privateSubnetv4}"
       ];
       dhcp.enabled = false;

pkgs/default.nix

@@ -3,6 +3,7 @@
   (_self: super: {
     zsh-histdb-skim = super.callPackage ./zsh-histdb-skim.nix {};
     zsh-histdb = super.callPackage ./zsh-histdb.nix {};
+    your_spotify = super.callPackage ./your_spotify.nix {};
     deploy = super.callPackage ./deploy.nix {};
     minify = super.callPackage ./minify {};
     awakened-poe-trade = super.callPackage ./awakened-poe-trade.nix {};

pkgs/deploy.nix

@@ -1,6 +1,7 @@
 {
   symlinkJoin,
   writeShellApplication,
+  nvd,
   nix-output-monitor,
 }: let
   deploy = writeShellApplication {
@@ -92,7 +93,7 @@
                  	ssh "$host" -- "$top_level/bin/switch-to-configuration" "$ACTION" \
                  	|| die "Error activating toplevel for $system"
           if [[ -n "$prev_system" ]]; then
-                 ssh "$host" -- nvd --color always diff "$prev_system" "$top_level"
+                 ssh "$host" -- ${nvd}/bin/nvd --color always diff "$prev_system" "$top_level"
                fi
              )
                  }

pkgs/your_spotify.nix

@@ -0,0 +1,47 @@
+{
+  mkYarnPackage,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  makeWrapper,
+  nodejs,
+  lib,
+}: let
+  version = "1.7.3";
+  src_o = fetchFromGitHub {
+    owner = "Yooooomi";
+    repo = "your_spotify";
+    rev = "refs/tags/${version}";
+    hash = "sha256-/0xKktywwGcqsuwLytWBJ3O6ADHg1nP6BdMRlkW5ErY=";
+  };
+in
+  mkYarnPackage rec {
+    inherit version;
+    pname = "your_spotify";
+    src = "${src_o}/server";
+    offlineCache = fetchYarnDeps {
+      yarnLock = src + "/yarn.lock";
+      hash = "sha256-3ZK+p3RoHHjPu53MLGSho7lEroZ77vUrZ2CjDwIUQTs=";
+    };
+    postPatch = ''
+      substituteInPlace tsconfig.json --replace '"extends": "../tsconfig.json",' ""
+    '';
+    buildPhase = ''
+      runHook preBuild
+      pushd ./deps/server
+      yarn --offline run build
+      popd
+      runHook postBuild
+    '';
+    nativeBuildInputs = [makeWrapper];
+    installPhase = ''
+      mkdir -p $out
+      cp -r $node_modules $out/node_modules
+      cp -r ./deps/server/{lib,package.json} $out
+      mkdir -p $out/bin
+      makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_migrate" \
+        --add-flags "$out/lib/migrations.js"
+      makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_server" \
+        --add-flags "$out/lib/bin/www.js"
+    '';
+    doDist = false;
+  }