From 800a95d43185b52bfa1ff3b06837b664eae571d1 Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Wed, 31 Jan 2024 21:42:13 -0700
Subject: [PATCH] Update to nixos 23.11

---
 common/network/vpn.nix             | 3 ---
 common/server/gitea.nix            | 6 ++++--
 common/server/nextcloud.nix        | 3 +--
 flake.lock                         | 8 ++++----
 flake.nix                          | 2 +-
 machines/ponyo/default.nix         | 2 +-
 machines/zoidberg/default.nix      | 2 +-
 overlays/kernel-modules/gasket.nix | 4 ++--
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/common/network/vpn.nix b/common/network/vpn.nix
index 81e7f5a..b854deb 100644
--- a/common/network/vpn.nix
+++ b/common/network/vpn.nix
@@ -72,9 +72,6 @@ in
       config = {
         imports = allModules ++ [ cfg.config ];
 
-        # speeds up evaluation
-        nixpkgs.pkgs = pkgs;
-
         # networking.firewall.enable = mkForce false;
         networking.firewall.trustedInterfaces = [
           # completely trust internal interface to host
diff --git a/common/server/gitea.nix b/common/server/gitea.nix
index 2c741a0..6188d90 100644
--- a/common/server/gitea.nix
+++ b/common/server/gitea.nix
@@ -12,12 +12,14 @@ in
   };
   config = lib.mkIf cfg.enable {
     services.gitea = {
-      domain = cfg.hostname;
-      rootUrl = "https://${cfg.hostname}/";
       appName = cfg.hostname;
       # lfs.enable = true;
       # dump.enable = true;
       settings = {
+        server = {
+          ROOT_URL = "https://${cfg.hostname}/";
+          DOMAIN = cfg.hostname;
+        };
         other = {
           SHOW_FOOTER_VERSION = false;
         };
diff --git a/common/server/nextcloud.nix b/common/server/nextcloud.nix
index 30129d9..34e929a 100644
--- a/common/server/nextcloud.nix
+++ b/common/server/nextcloud.nix
@@ -8,13 +8,12 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       https = true;
-      package = pkgs.nextcloud25;
+      package = pkgs.nextcloud26;
       hostName = "neet.cloud";
       config.dbtype = "sqlite";
       config.adminuser = "jeremy";
       config.adminpassFile = "/run/agenix/nextcloud-pw";
       autoUpdateApps.enable = true;
-      enableBrokenCiphersForSSE = false;
     };
     age.secrets.nextcloud-pw = {
       file = ../../secrets/nextcloud-pw.age;
diff --git a/flake.lock b/flake.lock
index f3a86dd..721cf11 100644
--- a/flake.lock
+++ b/flake.lock
@@ -185,16 +185,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1706515015,
+        "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 99fbf4c..2143f8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     flake-utils.url = "github:numtide/flake-utils";
 
diff --git a/machines/ponyo/default.nix b/machines/ponyo/default.nix
index 4e269d9..385614a 100644
--- a/machines/ponyo/default.nix
+++ b/machines/ponyo/default.nix
@@ -96,7 +96,7 @@
     };
   };
   # pin postgresql for matrix (will need to migrate eventually)
-  services.postgresql.package = pkgs.postgresql_11;
+  services.postgresql.package = pkgs.postgresql_15;
 
   # iodine DNS-based vpn
   services.iodine.server.enable = true;
diff --git a/machines/zoidberg/default.nix b/machines/zoidberg/default.nix
index c609bec..99a6012 100644
--- a/machines/zoidberg/default.nix
+++ b/machines/zoidberg/default.nix
@@ -38,7 +38,7 @@
     rocm-opencl-runtime
   ];
   systemd.tmpfiles.rules = [
-    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
+    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   ];
 
   # System wide barrier instance
diff --git a/overlays/kernel-modules/gasket.nix b/overlays/kernel-modules/gasket.nix
index 1f9d60a..88444b4 100644
--- a/overlays/kernel-modules/gasket.nix
+++ b/overlays/kernel-modules/gasket.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gasket-driver";
-    rev = "97aeba584efd18983850c36dcf7384b0185284b3";
-    sha256 = "pJwrrI7jVKFts4+bl2xmPIAD01VKFta2SRuElerQnTo=";
+    rev = "09385d485812088e04a98a6e1227bf92663e0b59";
+    sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4=";
   };
 
   makeFlags = [