Update to nixos 24.05

machines/common.nix

@@ -1,7 +1,7 @@
 inputs:
 { config, lib, pkgs, ... }: {
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixStable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -86,14 +86,19 @@ inputs:
       enable = true;
     };
 
+    displayManager = {
+      defaultSession = "none+i3";
+    };
+
     xserver = {
       enable = true;
 
-      layout = "eu";
-      xkbOptions = "caps:escape";
+      xkb = {
+        options = "caps:escape";
+        layout = "eu";
+      };
 
       displayManager = {
-        defaultSession = "none+i3";
         lightdm.enable = true;
       };
 
@@ -174,7 +179,7 @@ inputs:
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
     };
     thunar = {
       enable = true;