From 77ebfae85124967320cdbc817df8613bf829ee77 Mon Sep 17 00:00:00 2001
From: "hermitcollective.net" <hertog@fsfe.org>
Date: Tue, 11 Feb 2025 12:03:45 +0000
Subject: [PATCH] Updated nixos version to latest unstable and nextcloud to 30

---
 flake.lock             | 33 ++++++---------------------------
 flake.nix              |  6 ------
 services/nextcloud.nix |  2 +-
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0d17303..f3e2f83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708160520,
-        "narHash": "sha256-2PdzJHLBYQ+Vy4pF7/e76YVfxIOjQJ3+JcBL6xRmSK4=",
+        "lastModified": 1738872933,
+        "narHash": "sha256-6JXcU1YPKqDu9SzRTRU1qym+xZuZr6zqDq97YwZX7tg=",
         "owner": "nlewo",
         "repo": "comin",
-        "rev": "529a27caaffd30b9ac3e8d48250a2566b5e36f4e",
+        "rev": "fc4a395f2181b8f271087ff0e3938d99973d1122",
         "type": "github"
       },
       "original": {
@@ -20,33 +20,13 @@
         "type": "github"
       }
     },
-    "iceshrimp": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709197042,
-        "narHash": "sha256-EXTZ6H6+Pm/1wqdeijVkasXJFgvFN5fiCW6+S5pqNWA=",
-        "ref": "refs/heads/dev",
-        "rev": "04f8a479f1d80ae436246dfda3ebb1fcd4ded1e6",
-        "revCount": 42,
-        "type": "git",
-        "url": "https://iceshrimp.dev/iceshrimp/packaging"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://iceshrimp.dev/iceshrimp/packaging"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707956935,
-        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
+        "lastModified": 1739020877,
+        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
+        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
         "type": "github"
       },
       "original": {
@@ -58,7 +38,6 @@
     "root": {
       "inputs": {
         "comin": "comin",
-        "iceshrimp": "iceshrimp",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index f67bf87..ceee642 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,17 +7,12 @@
       url = "github:nlewo/comin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    iceshrimp = {
-      url = "git+https://iceshrimp.dev/iceshrimp/packaging";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = { 
     self,
     nixpkgs,
     comin,
-    iceshrimp,
     ... 
   }@inputs:
 
@@ -35,7 +30,6 @@
         inherit system;
         modules = [
 	  comin.nixosModules.comin
-          iceshrimp.nixosModules.iceshrimp
 
 	  ./services # NOTE: many services are to be revamped or moved to the secondary server when complete
 	  ./sites
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index b476b4f..1ee701b 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -3,7 +3,7 @@
 {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud28;
+    package = pkgs.nextcloud30;
     appstoreEnable = true;
     hostName = "cloud.hermitcollective.net";
     config = {