From f6cecec40825d41c426e598043be6b8509778a18 Mon Sep 17 00:00:00 2001
From: glenn <glenn@nixos.org>
Date: Mon, 7 Oct 2024 10:36:53 +0200
Subject: [PATCH] disable ai stuff and bumb major version

---
 flake.lock    | 45 +++++++++++++++++++++++++++++----------------
 flake.nix     |  2 +-
 nextcloud.nix |  6 +++---
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6302832..4b2c503 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,9 +53,7 @@
     "home": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1719229408,
@@ -78,11 +76,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721852138,
-        "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
+        "lastModified": 1728041527,
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
         "type": "github"
       },
       "original": {
@@ -101,11 +99,11 @@
         "nixpkgs-24_05": "nixpkgs-24_05"
       },
       "locked": {
-        "lastModified": 1721121314,
-        "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=",
+        "lastModified": 1722877200,
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "059b50b2e729729ea00c6831124d3837c494f3d5",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
@@ -116,16 +114,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721562059,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
-        "owner": "NixOS",
+        "lastModified": 1711371852,
+        "narHash": "sha256-lC5eiopclTw7MuJV/UEHZ6H7ZPvVl5tSU+SjpmEh1R0=",
+        "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+        "rev": "973ce720b3126836a9d5cea1e2f89d603dea7a87",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "NixOs",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -145,12 +142,28 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home": "home",
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 5812de1..469b7f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home = {
       url = "git+https://git.sondell.org/glennwso/home.git";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/nextcloud.nix b/nextcloud.nix
index 3c509d3..9ac55bb 100644
--- a/nextcloud.nix
+++ b/nextcloud.nix
@@ -6,11 +6,11 @@
   ...
 }: let
   domain = "cloud.sondell.org";
-  nextcloud = pkgs.nextcloud29;
+  nextcloud = pkgs.nextcloud30;
 
   app_api = pkgs.fetchNextcloudApp {
     url = "https://github.com/cloud-py-api/app_api/releases/download/v2.7.0/app_api-v2.7.0.tar.gz";
-    sha256 = "sha256-l/ZbHbsITUFk/Ay3xpX60UwifG9aWZBQoz3fSEjVO30=";
+    sha256 = "sha256-FIVM5QoDYxHa3rWmNatLo3rv7Geou+mbdEh9Ws/KT7Q=";
     license = "agpl3Only";
   };
 in {
@@ -108,7 +108,7 @@ in {
       extraApps = with config.services.nextcloud.package.packages.apps; {
         # List of apps we want to install and are already packaged in
         # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json
-        inherit mail calendar contacts notes onlyoffice cookbook spreed memories previewgenerator integration_openai app_api;
+        inherit mail calendar contacts notes onlyoffice cookbook spreed memories previewgenerator;
       };
       config = {
         overwriteProtocol = "https";