From f6e63c0fdf84a91ddc450d431c47ebeacb90e09b Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Thu, 5 Dec 2024 14:31:55 +0200
Subject: [PATCH] Upgrade inputs to 24.11

---
 defaults/base-minimal/default.nix |  7 +++++--
 flake.lock                        | 29 +++++++++++++----------------
 flake.nix                         |  3 +--
 nixos-modules/meta/network.nix    |  2 +-
 updates.md                        | 10 +++++++++-
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/defaults/base-minimal/default.nix b/defaults/base-minimal/default.nix
index bd2948f..078d647 100644
--- a/defaults/base-minimal/default.nix
+++ b/defaults/base-minimal/default.nix
@@ -72,7 +72,7 @@
       dates = "weekly";
       options = "--delete-older-than 90d";
     };
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -105,7 +105,10 @@
   };
 
   programs.autojump.enable = true;
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   sops.defaultSopsFile =
     let
diff --git a/flake.lock b/flake.lock
index b99c44c..8f0ef83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731274291,
-        "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=",
+        "lastModified": 1733168902,
+        "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc",
+        "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
         "type": "github"
       },
       "original": {
@@ -176,27 +176,27 @@
     },
     "nixpkgs-nixos-stable": {
       "locked": {
-        "lastModified": 1731239293,
-        "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
+        "lastModified": 1733261153,
+        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
+        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
@@ -272,17 +272,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs-nixos-unstable"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs-nixos-stable"
         ]
       },
       "locked": {
-        "lastModified": 1731213149,
-        "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
+        "lastModified": 1733128155,
+        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
+        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 98f5cca..b641eed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,11 @@
       inputs.nixpkgs.follows = "nixpkgs-nixos-stable";
     };
     nixpkgs-nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs-nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs = {
         nixpkgs.follows = "nixpkgs-nixos-unstable";
-        nixpkgs-stable.follows = "nixpkgs-nixos-stable";
       };
     };
     private.url = "git+file:./private";
diff --git a/nixos-modules/meta/network.nix b/nixos-modules/meta/network.nix
index a17a9e9..3caa3d7 100644
--- a/nixos-modules/meta/network.nix
+++ b/nixos-modules/meta/network.nix
@@ -146,7 +146,7 @@ in
                         });
                       };
 
-                      # Taken from https://github.com/NixOS/nixpkgs/blob/nixos-21.11/nixos/modules/services/networking/wireguard.nix: 
+                      # Taken from https://github.com/NixOS/nixpkgs/blob/nixos-21.11/nixos/modules/services/networking/wireguard.nix:
                       publicKey = mkOption {
                         example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";
                         type = str;
diff --git a/updates.md b/updates.md
index 81a414d..0f7994c 100644
--- a/updates.md
+++ b/updates.md
@@ -39,7 +39,13 @@ For kernel updates, it might be required to reboot machines, which can be done i
 pssh -l root -H lindberg-nextcloud.backplane.net.qo.is -H lindberg-build.backplane.net.qo.is reboot
 ```
 
-## Aplication Updates
+## `systemVersion` upgrades
+
+- Make sure to read through the nixpkgs changelog to catch configuration scheme changes,
+  successor applications or for the need for manual interventions.
+- Pay special attention the applications listed below.
+
+## Application Updates
 
 Some applications have pinned versions to prevent problems due to accidental upgrades.  
 The version switch has to be done manually by switching the package used.
@@ -47,3 +53,5 @@ The version switch has to be done manually by switching the package used.
 This includes the modules for:
 
 - `nextcloud`
+- `postgresql`, [&rarr; Nixpkgs manual page](https://nixos.org/manual/nixos/stable/#module-services-postgres-upgrading)
+