Upgrade to NixOS 23.11

barrucadu · Jan 2, 2024 · 2abccb0 · 2abccb0
1 parent 2ffe4ec
commit 2abccb0
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     poetry2nix = {
-      url = "github:nix-community/poetry2nix?rev=e23218d1599e3369dfc878757e58974017e0ecc8";
+      url = "github:nix-community/poetry2nix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
@@ -23,7 +23,7 @@
       system = "x86_64-linux";
       pkgs = import nixpkgs {
         inherit system;
-        overlays = [ poetry2nix.overlay ];
+        overlays = [ poetry2nix.overlays.default ];
       };
     in
     {

diff --git a/hosts/azathoth/configuration.nix b/hosts/azathoth/configuration.nix
@@ -60,7 +60,7 @@ in
     enableGhostscriptFonts = true;
     fontconfig.cache32Bit = true;
 
-    fonts = with pkgs; [
+    packages = with pkgs; [
       terminus_font
       source-code-pro
     ];

diff --git a/hosts/nyarlathotep/configuration.nix b/hosts/nyarlathotep/configuration.nix
@@ -143,7 +143,7 @@ in
     description = "Guest user";
     isNormalUser = true;
     group = "users";
-    passwordFile = config.sops.secrets."users/notbarrucadu".path;
+    hashedPasswordFile = config.sops.secrets."users/notbarrucadu".path;
     shell = "/run/current-system/sw/bin/nologin";
   };
   sops.secrets."users/notbarrucadu".neededForUsers = true;

diff --git a/shared/default.nix b/shared/default.nix
@@ -46,7 +46,7 @@ in
     #############################################################################
 
     # The NixOS release to be compatible with for stateful data such as databases.
-    system.stateVersion = "23.05";
+    system.stateVersion = "23.11";
 
     # Only keep the last 500MiB of systemd journal.
     services.journald.extraConfig = "SystemMaxUse=500M";
@@ -87,7 +87,7 @@ in
     i18n.defaultLocale = "en_GB.UTF-8";
 
     # Timezone
-    services.timesyncd.enable = true;
+    services.timesyncd.enable = mkForce true;
     time.timeZone = "Europe/London";
 
     # Keyboard

diff --git a/shared/erase-your-darlings/default.nix b/shared/erase-your-darlings/default.nix
@@ -37,7 +37,7 @@ in
     # Switch back to immutable users
     users.mutableUsers = mkForce false;
     users.extraUsers.barrucadu.initialPassword = mkForce null;
-    users.extraUsers.barrucadu.passwordFile = cfg.barrucaduPasswordFile;
+    users.extraUsers.barrucadu.hashedPasswordFile = cfg.barrucaduPasswordFile;
 
     # Persist state in `cfg.persistDir`
     services.openssh.hostKeys = [