Upgrade to NixOS 23.11

3 files changed, 96 insertions, 93 deletions

diff --git a/hostnix/weebnix/home-assistant.nix b/hostnix/weebnix/home-assistant.nix
index ee443ee..16c73e7 100644
--- a/hostnix/weebnix/home-assistant.nix
+++ b/hostnix/weebnix/home-assistant.nix
@@ -38,7 +38,7 @@ in {
     ensureDatabases = [ "hass" ];
     ensureUsers = [{
       name = "hass";
-      ensurePermissions = { "DATABASE hass" = "ALL PRIVILEGES"; };
+      ensureDBOwnership = true;
     }];
   };
 
diff --git a/hostnix/weebnix/syncthing.nix b/hostnix/weebnix/syncthing.nix
index b607e16..ed87720 100644
--- a/hostnix/weebnix/syncthing.nix
+++ b/hostnix/weebnix/syncthing.nix
@@ -19,99 +19,101 @@ in
     openDefaultPorts = true;
     # Syncthing supports named sockets but the NixOS module assumes network.
     guiAddress = "[::1]:8384";
-    devices = {
-      "Asus Nexus 7" = {
-        id = "BVZARYC-2D56A6I-V6L2VQF-MU7IVCT-ITJTCGQ-IGMZG2W-RZRCTOT-K4GDHAY";
+    settings = {
+      devices = {
+        "Asus Nexus 7" = {
+          id = "BVZARYC-2D56A6I-V6L2VQF-MU7IVCT-ITJTCGQ-IGMZG2W-RZRCTOT-K4GDHAY";
+        };
+        "DESKTOP-SFVBFBU" = {
+          id = "FQEK2MG-2AVMHEM-H6KASQ3-RTA3Z3F-A4R4MUY-YELZVRQ-6QUDSHA-DZZN7AJ";
+          autoAcceptFolders = true;
+        };
+        "Joes-iPhone-6" = {
+          id = "F5APH5K-XXO454B-6YU4BTT-YPHF4KT-OD7YF5Y-JTWJRSU-UNJ2KZK-IVJZNQT";
+          autoAcceptFolders = true;
+        };
+        "iPad" = {
+          id = "U7D7667-RFEFHXX-TUJGGII-CE62S6P-YC6MWNV-4LBJ4YJ-5ZUZVPT-GBC5PQH";
+          autoAcceptFolders = true;
+        };
+        "maxsettings-C6554E6AF22F" = {
+          id = "HO3QQZO-RDWYDB6-U74ZQRC-FP7YPB2-IPB2EBC-KIQ5JII-FD4KBXR-J3GCOQ5";
+          autoAcceptFolders = true;
+        };
+        "penguin" = {
+          id = "5BEB6SZ-YAPV3CC-54RZF3V-HQXXP3Y-TTVDWDU-SHHNVCH-IXKZ3O2-6RXG6QL";
+          autoAcceptFolders = true;
+        };
+        "sparky" = {
+          id = "FE43LDI-33WS467-LIGFWCC-5PPSKN6-GYODEWJ-KLQZLN7-H3GYGLG-IJ2JGQW";
+          autoAcceptFolders = true;
+        };
+        "steamdeck" = {
+          id = "SCUAABL-XU6AS5H-IZZE4PN-LY5J4LH-OYZMXTU-2UMTVUL-I7B7QKE-ZBPSAQ5";
+          autoAcceptFolders = true;
+        };
+        "weeber.mou.fo" = {
+          id = "PRE6XCX-7JDMJGJ-6TPMHOS-TP2AT3S-T6CAR3Z-URL5EEU-HVXUDJ4-C5UJ2AV";
+          autoAcceptFolders = true;
+        };
       };
-      "DESKTOP-SFVBFBU" = {
-        id = "FQEK2MG-2AVMHEM-H6KASQ3-RTA3Z3F-A4R4MUY-YELZVRQ-6QUDSHA-DZZN7AJ";
-        autoAcceptFolders = true;
-      };
-      "Joes-iPhone-6" = {
-        id = "F5APH5K-XXO454B-6YU4BTT-YPHF4KT-OD7YF5Y-JTWJRSU-UNJ2KZK-IVJZNQT";
-        autoAcceptFolders = true;
-      };
-      "iPad" = {
-        id = "U7D7667-RFEFHXX-TUJGGII-CE62S6P-YC6MWNV-4LBJ4YJ-5ZUZVPT-GBC5PQH";
-        autoAcceptFolders = true;
-      };
-      "maxsettings-C6554E6AF22F" = {
-        id = "HO3QQZO-RDWYDB6-U74ZQRC-FP7YPB2-IPB2EBC-KIQ5JII-FD4KBXR-J3GCOQ5";
-        autoAcceptFolders = true;
-      };
-      "penguin" = {
-        id = "5BEB6SZ-YAPV3CC-54RZF3V-HQXXP3Y-TTVDWDU-SHHNVCH-IXKZ3O2-6RXG6QL";
-        autoAcceptFolders = true;
-      };
-      "sparky" = {
-        id = "FE43LDI-33WS467-LIGFWCC-5PPSKN6-GYODEWJ-KLQZLN7-H3GYGLG-IJ2JGQW";
-        autoAcceptFolders = true;
-      };
-      "steamdeck" = {
-        id = "SCUAABL-XU6AS5H-IZZE4PN-LY5J4LH-OYZMXTU-2UMTVUL-I7B7QKE-ZBPSAQ5";
-        autoAcceptFolders = true;
-      };
-      "weeber.mou.fo" = {
-        id = "PRE6XCX-7JDMJGJ-6TPMHOS-TP2AT3S-T6CAR3Z-URL5EEU-HVXUDJ4-C5UJ2AV";
-        autoAcceptFolders = true;
-      };
-    };
-    folders = {
-      "Documents" = {
-        id = "bhemx-9nh3v";
-        path = "~/Documents";
-        versioning = staggeredVersioning;
-        devices = [ "sparky" "weeber.mou.fo" ];
-      };
-      "Downloads" = {
-        id = "kvq6q-axjhu";
-        path = "~/Downloads";
-        versioning = staggeredVersioning;
-        devices = [ "sparky" "weeber.mou.fo" ];
-      };
-      "Game/Documents/Bioshock" = {
-        id = "7zhqz-x6uvw";
-        path = "~/Game/Documents/Bioshock";
-        versioning = staggeredVersioning;
-        devices = [ "weeber.mou.fo" ];
-      };
-      "Game/Epic Games/TheTalosPrinciple/UserData" = {
-        id = "vek7u-iausx";
-        path = "~/Game/Epic Games/TheTalosPrinciple/UserData";
-        versioning = staggeredVersioning;
-        devices = [ "DESKTOP-SFVBFBU" "maxsettings-C6554E6AF22F" "weeber.mou.fo" ];
-      };
-      "Game/PCSX2" = {
-        id = "chxsg-hpqgm";
-        path = "~/Game/PCSX2";
-        versioning = staggeredVersioning;
-        devices = [ "maxsettings-C6554E6AF22F" "weeber.mou.fo" ];
-      };
-      "Pictures" = {
-        id = "vfjsd-4fczh";
-        path = "~/Pictures";
-        versioning = staggeredVersioning;
-        devices = [ "sparky" "weeber.mou.fo" ];
-      };
-      "Sync" = {
-        id = "7thks-5badk";
-        path = "~/Sync";
-        versioning = staggeredVersioning;
-        devices = [
-          "Asus Nexus 7"
-          "DESKTOP-SFVBFBU"
-          "Joes-iPhone-6"
-          "iPad"
-          "penguin"
-          "sparky"
-          "weeber.mou.fo"
-        ];
-      };
-      "iPad" = {
-        id = "qtzmu-fqdrs";
-        path = "~/iPad";
-        versioning = staggeredVersioning;
-        devices = [ "iPad" ];
+      folders = {
+        "Documents" = {
+          id = "bhemx-9nh3v";
+          path = "~/Documents";
+          versioning = staggeredVersioning;
+          devices = [ "sparky" "weeber.mou.fo" ];
+        };
+        "Downloads" = {
+          id = "kvq6q-axjhu";
+          path = "~/Downloads";
+          versioning = staggeredVersioning;
+          devices = [ "sparky" "weeber.mou.fo" ];
+        };
+        "Game/Documents/Bioshock" = {
+          id = "7zhqz-x6uvw";
+          path = "~/Game/Documents/Bioshock";
+          versioning = staggeredVersioning;
+          devices = [ "weeber.mou.fo" ];
+        };
+        "Game/Epic Games/TheTalosPrinciple/UserData" = {
+          id = "vek7u-iausx";
+          path = "~/Game/Epic Games/TheTalosPrinciple/UserData";
+          versioning = staggeredVersioning;
+          devices = [ "DESKTOP-SFVBFBU" "maxsettings-C6554E6AF22F" "weeber.mou.fo" ];
+        };
+        "Game/PCSX2" = {
+          id = "chxsg-hpqgm";
+          path = "~/Game/PCSX2";
+          versioning = staggeredVersioning;
+          devices = [ "maxsettings-C6554E6AF22F" "weeber.mou.fo" ];
+        };
+        "Pictures" = {
+          id = "vfjsd-4fczh";
+          path = "~/Pictures";
+          versioning = staggeredVersioning;
+          devices = [ "sparky" "weeber.mou.fo" ];
+        };
+        "Sync" = {
+          id = "7thks-5badk";
+          path = "~/Sync";
+          versioning = staggeredVersioning;
+          devices = [
+            "Asus Nexus 7"
+            "DESKTOP-SFVBFBU"
+            "Joes-iPhone-6"
+            "iPad"
+            "penguin"
+            "sparky"
+            "weeber.mou.fo"
+          ];
+        };
+        "iPad" = {
+          id = "qtzmu-fqdrs";
+          path = "~/iPad";
+          versioning = staggeredVersioning;
+          devices = [ "iPad" ];
+        };
       };
     };
   };
diff --git a/hostnix/weebnix/system.nix b/hostnix/weebnix/system.nix
index f625efd..8c80708 100644
--- a/hostnix/weebnix/system.nix
+++ b/hostnix/weebnix/system.nix
@@ -20,6 +20,7 @@
   };
 
   systemd.network.enable = true;
+  networking.useNetworkd = true;
   networking.dhcpcd.enable = false;
   networking.tempAddresses = "disabled";