From fcf8edd53e553203d0ed276cdfb1ae91284d756b Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:29:13 +0200
Subject: [PATCH] update to nixpkgs-unstable

---
 flake.nix                          |   6 +++---
 modules/services/github-runner.nix |   2 +-
 modules/services/kavita.nix        |   2 +-
 modules/services/nextcloud.nix     |  11 +++--------
 secrets/github-runner-token.age    | Bin 581 -> 526 bytes
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9a7646f..608d4df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,20 +38,20 @@
     in {
     overlays = import ./overlays.nix {inherit inputs;};
 
-    nixosConfigurations.server = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.server = nixpkgs-unstable.lib.nixosSystem {
       inherit system;
       modules = [
         ./users/anon
         ./modules/collections/server.nix
         ./systems/server/configuration.nix
         ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
-        home-manager.nixosModules.home-manager
+        home-manager-unstable.nixosModules.home-manager
         agenix.nixosModules.default
       ];
       specialArgs = {
         ## Custom variables (e.g. ip, interface, etc)
         vars = import ./systems/userdata-default.nix // import ./systems/server/userdata.nix;
-        pkgsVersion = nixpkgs;
+        pkgsVersion = nixpkgs-unstable;
         inherit inputs outputs;
       };
     };
diff --git a/modules/services/github-runner.nix b/modules/services/github-runner.nix
index fba7c45..c1e72a6 100644
--- a/modules/services/github-runner.nix
+++ b/modules/services/github-runner.nix
@@ -26,7 +26,7 @@
         "d /data 0770 github-actions-runner nginx -"
         "d /data/website 0770 github-actions-runner nginx -"
     ];
-    services.github-runner = {
+    services.github-runners.oberprofis = {
         enable = true;
         name = "nixos-server";
         tokenFile = config.age.secrets.github-runner-token.path;
diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix
index a50f50c..c79e0f3 100644
--- a/modules/services/kavita.nix
+++ b/modules/services/kavita.nix
@@ -19,7 +19,7 @@ in
   services.kavita = {
     enable = true;
     user = "kavita";
-    port = 5000;
+    settings.Port = 5000;
     dataDir = baseDir;
     tokenKeyFile = config.age.secrets.kavita.path;
   };
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index d573f80..7fddd1f 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -39,21 +39,16 @@ in
     };
     services.nextcloud = {
         enable = true;
-        package = pkgs.nextcloud27;
+        package = pkgs.nextcloud28;
         https = true;
         hostName = "nextcloud.home.arpa";
         config.adminpassFile = config.age.secrets.nextcloud-admin.path;
         config.dbtype = "pgsql";
         database.createLocally = true;
-        config.extraTrustedDomains = [ wireguardIp "nextcloud.home.arpa" ];
+        settings.trusted_domains = [ wireguardIp "nextcloud.home.arpa" ];
         home = "/mnt/250ssd/nextcloud";
         extraApps = with config.services.nextcloud.package.packages.apps; {
             inherit onlyoffice calendar mail;
-            spreed = pkgs.fetchNextcloudApp rec {
-                url = "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz";
-                sha256 = "sha256-LaUG0maatc2YtWQjff7J54vadQ2RE4X6FcW8vFefBh8=";
-                license = "agpl3";
-            };
         };
 
         phpOptions = {
@@ -61,7 +56,7 @@ in
           post_max_size = lib.mkForce "20G";
         };
         extraAppsEnable = true;
-        extraOptions.enabledPreviewProviders = [
+        settings.enabledPreviewProviders = [
             "OC\\Preview\\BMP"
             "OC\\Preview\\GIF"
             "OC\\Preview\\JPEG"
diff --git a/secrets/github-runner-token.age b/secrets/github-runner-token.age
index 69edd0d858aabb2db4fef00d7a9524f73e2213f5..981a3965916312e114494324e641a63d81faf617 100644
GIT binary patch
delta 473
zcmX@g(#JAEr`|WrIV;T1FDWrJs4_I)$J8s$&p)KnGN+=*+$F!n*flGs%G@>G$uhXy
zfXgc>$T!q1INKvBA|)up-z~_=+1oeG($v&4B*i_T%DK`kDKaA|J)+1gnM>DBp}06h
zH#Nn`)YQ;Y!86R*B|A{TG}N^!!q=&&w9-t!BG)T9-Ay~hHL|KQ!!xtouq4>qHLsv3
zt<<I1&oCp9%d=QJJ1fXH$jv1^F~YF4Fd)Fxsno}<$~`JcJH@Z4!ZR>0I6ciVDmy%R
z;z#lN3itddufPhYywZ~J)MAgY6r-xZbp6syeSdS)(9oR7z!E2yw20CO4-ZGKGNUZx
z$fPLa49lPh7x#SgKrijI$VC0bVAEjlJYzr0$U+lO=a4YZO20rZU0q#;$l}607iXWO
zfRxfK6QBHYKLbMxH|?M-Pg9TFQdh^4M8~N53hhLHBTL_8u9-Z_Dx#}Jvc=CDtmk8m
zUb*)3*E_4O-f?hT^Ve_PxyL1cSj0D~WR<Bb^H?Ty_?7M>Ue@(KezQCO{rGKX>*RUv
zJZHqjcDVp$w(7nMe_g(@6taiCxyIvWow!ZspJj$rk>Gzp-MM0af?t>TnXfcR5z#r5
S@J8-LI){$wGns5=aUTE<aH($q

delta 528
zcmeBUIm$9Yr#?tOJUh?avC^foAU(V^Dx@mZ%P}K7%f!7v+r_6azbH4)GbbRiI5#(=
zoXfP((>1stBhaioB*`~3+}l4RH8m{4B|TExBhb+}P(Q%kE4R?oG$^^!fJ@g-p}06h
zH#Nn`)YQ;Y!86R*B|A{T)TA)L&pRSG**rYcH`w39)lECe(8a<yA|T8x(WorBB-PZ?
zH_X#DLcb!PD=#lHuQD~m)g&}2H`z1LwKO0o*FC~Auqeg7FeO*tpdh1EKPS!ABFe;K
z;z#j%Ba<|fB-7H0Dp%KV|B}LN<0}6GgNUqr^GuU`uga)k6W=^f&&<F8S0hKRWEYbp
zQ>XM&6Jz}}FQ*9e#NZ^e;?$DN0>k{m;L3tv6A%BC97pG{GB;0<Pt0`Fi&7JdQx(d&
zDw2vUL$%!k^^3H#Q^H--@`4jB^86#i%j+uxa&t0W%M1<8EHXmEvIC1Ms|q4b4PBB_
z-OU{x!;2HM@*Ts?%(x1TeJit_iX(%Z!ktUA4WqnGlJZ<DEknGWQiBT%oD6)5vYbLJ
zEVy)abrmY~OZ<upyiEKuOx?>eD<i!lUHuX(P4z7d$}LU(%`=>Q3~~dCGxLHSi|x7g
zKdoC{?%2X7@^+%`>L0V~TF>U?vRfYUV7T${oDE~|-rvu-8<?1j=JM#4`>kDjmV1TI
QyIxnH3d@`3j{P?(0BJ|Gy8r+H