diff --git a/desktop/x11.nix b/desktop/x11.nix
index 2f44f19..252b536 100644
--- a/desktop/x11.nix
+++ b/desktop/x11.nix
@@ -3,6 +3,6 @@
 {
   # Enable the X11 windowing system.
   services.xserver.enable = true;
-  services.xserver.layout = "gb";
-  services.xserver.xkbOptions = "eurosign:e";
+  services.xserver.xkb.layout = "gb";
+  services.xserver.xkb.options = "eurosign:e";
 }
diff --git a/flake.lock b/flake.lock
index 8d812e9..c66d90d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -323,16 +323,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1716711146,
-        "narHash": "sha256-CZ8vs7lX/qDqzJo/Vp/59q6yFxo99we2TSecUYJpeOc=",
+        "lastModified": 1716716433,
+        "narHash": "sha256-QNR7kydi+pnuSfCeVHjDJOId3YlRFYYQCRQ2rv2tuIU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "147c5eb5b39dee01c44feb6fca4632183e23e03b",
+        "rev": "142d4365b53e3c0f967c1757fed4a26f9e1747f5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -392,16 +392,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716361217,
-        "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
+        "lastModified": 1716542732,
+        "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
+        "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 042e591..b721147 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@ rec {
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
 
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
@@ -29,7 +29,7 @@ rec {
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -116,12 +116,13 @@ rec {
             src = ./.;
             hooks = {
               nixfmt.enable = true;
+              nixfmt.package = pkgs.nixfmt-classic;
               shellcheck.enable = true;
             };
           };
         };
 
-        formatter = pkgs.nixfmt;
+        formatter = pkgs.nixfmt-classic;
       };
     };
 }
diff --git a/home/browsers/firefoxAddons.nix b/home/browsers/firefoxAddons.nix
index d474292..9e572e3 100644
--- a/home/browsers/firefoxAddons.nix
+++ b/home/browsers/firefoxAddons.nix
@@ -26,7 +26,7 @@ in {
     meta = with lib; {
       homepage = "https://www.zotero.org";
       description = "Save references to Zotero from your web browser";
-      license = licenses.agpl3;
+      license = licenses.agpl3Plus;
       platforms = platforms.all;
     };
   };
diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix
index 4d4120c..e499db9 100644
--- a/home/editors/lsp.nix
+++ b/home/editors/lsp.nix
@@ -29,7 +29,7 @@
     nodePackages.eslint
     nodePackages.eslint_d
     statix
-    nixfmt
+    nixfmt-rfc-style
     buf
     nodePackages.stylelint
     nodePackages.prettier
diff --git a/home/felschr-server.nix b/home/felschr-server.nix
index ed32f63..59ab66a 100644
--- a/home/felschr-server.nix
+++ b/home/felschr-server.nix
@@ -13,7 +13,6 @@
     sshKeys = [ "3C48489F3B0FBB44E72180D4B1D7541C201C9987" ];
     defaultCacheTtl = 600;
     defaultCacheTtlSsh = 600;
-    pinentryFlavor = "curses";
   };
   programs.zsh.initExtra = ''
     export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index 6772fa8..f11fc08 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -23,7 +23,6 @@ with pkgs; {
     sshKeys = [ "8A6213DCDAF86BD3A63549FCFDF71B2C92DAE02C" ];
     defaultCacheTtl = 600;
     defaultCacheTtlSsh = 600;
-    pinentryFlavor = "gnome3";
   };
   programs.zsh.initExtra = ''
     export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
@@ -52,7 +51,7 @@ with pkgs; {
 
     # dev & admin
     pods
-    gaphor
+    # gaphor
 
     # security & privacy
     authenticator
diff --git a/home/felschr.nix b/home/felschr.nix
index 880caee..9549021 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -29,7 +29,6 @@
     ];
     defaultCacheTtl = 600;
     defaultCacheTtlSsh = 600;
-    pinentryFlavor = "gnome3";
   };
   programs.zsh.initExtra = ''
     export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
@@ -63,7 +62,7 @@
 
     # dev & admin
     pods
-    gaphor
+    # gaphor
 
     # game dev
     ldtk
@@ -87,7 +86,7 @@
     # yubioath-flutter # TODO conflicts with fluffychat
     magic-wormhole-rs
     warp
-    onionshare-gui
+    # onionshare-gui
     transmission_4-gtk
     qbittorrent
     fragments
diff --git a/home/shell/zsh.nix b/home/shell/zsh.nix
index 9759fa2..5e59c6a 100644
--- a/home/shell/zsh.nix
+++ b/home/shell/zsh.nix
@@ -4,7 +4,9 @@ let shellAliases = import ./aliases.nix;
 in {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    # TODO is being renamed again in later 24.05 release
+    autosuggestion.enable = true;
+    # autosuggestions.enable = true;
     autocd = true;
     defaultKeymap = "viins";
     history.extended = true;
diff --git a/modules/inadyn.nix b/modules/inadyn.nix
index 0b297e7..75b07ad 100644
--- a/modules/inadyn.nix
+++ b/modules/inadyn.nix
@@ -18,6 +18,10 @@ let
     ${ipCfg.extraConfig}
   '';
 in {
+  # NixOS 24.05 introduced an official module, but it works somewhat differently.
+  # For now I'll continue using my own module.
+  disabledModules = [ "services/networking/inadyn.nix" ];
+
   options = {
     services.inadyn = {
       enable = mkEnableOption (lib.mdDoc "inadyn DDNS client");
diff --git a/system/networking.nix b/system/networking.nix
index 8e032a6..2ed9230 100644
--- a/system/networking.nix
+++ b/system/networking.nix
@@ -8,7 +8,7 @@
   services.resolved = {
     enable = true;
     # don't use fallback resolvers
-    fallbackDns = config.networking.nameservers;
+    fallbackDns = [ ];
   };
 
   services.nextdns = {
diff --git a/system/printing/default.nix b/system/printing/default.nix
index b75c03a..6cf32a0 100644
--- a/system/printing/default.nix
+++ b/system/printing/default.nix
@@ -3,5 +3,5 @@
 {
   services.printing.enable = true;
   services.avahi.enable = true;
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
 }
diff --git a/system/sound.nix b/system/sound.nix
index 3a67246..4ff4146 100644
--- a/system/sound.nix
+++ b/system/sound.nix
@@ -11,12 +11,12 @@
     jack.enable = true;
   };
 
-  environment.etc."wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
-    bluez_monitor.properties = {
-      ["bluez5.enable-sbc-xq"] = true,
-      ["bluez5.enable-msbc"] = true,
-      ["bluez5.enable-hw-volume"] = true,
-      ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
-    }
-  '';
+  services.pipewire.wireplumber.extraConfig = {
+    "monitor.bluez.properties" = {
+      "bluez5.enable-sbc-xq" = true;
+      "bluez5.enable-msbc" = true;
+      "bluez5.enable-hw-volume" = true;
+      "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
+    };
+  };
 }