From 2ee4bc56827539a088ee0c3032b43704a4af84f0 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 2 Dec 2023 11:01:53 +0100
Subject: [PATCH] feat: NixOS 23.11 Tapir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://nixos.org/manual/nixos/stable/release-notes#sec-release-23.11-highlights

Track nixos-23.11 branch, remove unstable overlays

This will update our services to the following versions:
nextcloud: 27.1.3 -> 27.1.4
forgejo: 1.20.5-0 -> 1.20.6-0
keycloak: 21.1.2 -> 22.0.5
matrix-synapse: 1.95.1 -> 1.97.0

Internal:
postgresql: 14.9 -> 15.5

Flake inputs diff:
• Updated input 'home-manager':
    'github:nix-community/home-manager/28535c3a34d79071f2ccb68671971ce0c0984d7e' (2023-11-19)
  → 'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d2332963662edffacfddfad59ff4f709dde80ffe' (2023-11-30)
  → 'github:nixos/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01)
---
 flake.lock                      | 16 ++++++++--------
 flake.nix                       |  4 ++--
 hosts/flora-6/configuration.nix |  9 ---------
 hosts/nachtigall/default.nix    | 10 ----------
 overlays/default.nix            |  6 ------
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/flake.lock b/flake.lock
index 54d113a9..412674f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -161,16 +161,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1700392168,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "lastModified": 1700814205,
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -236,16 +236,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701362232,
-        "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
+        "lastModified": 1701389149,
+        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
+        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
         "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 c1711809..350ce522 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     # Track channels with commits tested and built by hydra
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
@@ -9,7 +9,7 @@
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager/release-23.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
diff --git a/hosts/flora-6/configuration.nix b/hosts/flora-6/configuration.nix
index dc208455..2c49348b 100644
--- a/hosts/flora-6/configuration.nix
+++ b/hosts/flora-6/configuration.nix
@@ -7,15 +7,6 @@
 }: let
   psCfg = config.pub-solar;
 in {
-  imports = [
-    "${flake.inputs.unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"
-    "${flake.inputs.unstable}/nixos/modules/services/web-servers/caddy/default.nix"
-  ];
-  disabledModules = [
-    "services/continuous-integration/gitea-actions-runner.nix"
-    "services/web-servers/caddy/default.nix"
-  ];
-
   config = {
     # Override nix.conf for more agressive garbage collection
     nix.extraOptions = lib.mkForce ''
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index 5e21f537..a7729a25 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -30,15 +30,5 @@
       ./apps/matrix/synapse.nix
       ./apps/matrix/irc.nix
       ./apps/nginx-matrix.nix
-
-      # Override with module from nixos-unstable, needs to be added
-      # to disabledModules as well
-      "${flake.inputs.unstable}/nixos/modules/services/misc/gitea.nix"
-      "${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix"
-    ];
-
-    disabledModules = [
-      "services/misc/gitea.nix"
-      "services/web-apps/mastodon.nix"
     ];
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index c11a2c9f..4f7efb86 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,12 +8,6 @@
       overlays = ({ ... }: {
         nixpkgs.overlays = [
           (final: prev: {
-            mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon;
-            forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo;
-            forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner;
-
-            mediawiki = inputs.unstable.legacyPackages.${prev.system}.mediawiki;
-
             element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
           })
         ];