diff --git a/configuration.nix b/configuration.nix
index f7a4760..dd89887 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -151,7 +151,7 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
   };
 
   nix = {
diff --git a/flake.lock b/flake.lock
index 277322b..1b12299 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1716729592,
-        "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1705260447,
-        "narHash": "sha256-30r/CoUwWBtTWtJX2tri4KsvR0OGwFJsNIk5bEWz0kE=",
+        "lastModified": 1717321100,
+        "narHash": "sha256-KGHHKh6seidZz6TzeTcD8K8elpruaBUKS6vkjhExIw4=",
         "owner": "mandlm",
         "repo": "nixos-hardware",
-        "rev": "02353c59409f60477ff4d566dfcfc9e9aef840fb",
+        "rev": "f06c266ab87393a08b79f861fcfa57c264510861",
         "type": "github"
       },
       "original": {
@@ -39,27 +39,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716633019,
-        "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1716769173,
-        "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
+        "lastModified": 1716948383,
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d36b7b7..5d2b3d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,12 @@
 {
   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;
 
     nixos-hardware.url = github:mandlm/nixos-hardware/p330;
 
     home-manager = {
-      url = github:nix-community/home-manager/release-23.11;
+      url = github:nix-community/home-manager/release-24.05;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/home-manager/gpg/default.nix b/home-manager/gpg/default.nix
index 3b7420a..fcd5f77 100644
--- a/home-manager/gpg/default.nix
+++ b/home-manager/gpg/default.nix
@@ -1,10 +1,10 @@
-{ config, lib, pkgs, user, ... }:
+{ pkgs, ... }:
 
 {
   services.gpg-agent = {
     enable = true;
     enableZshIntegration = true;
-    pinentryFlavor = "gnome3";
+    pinentryPackage = pkgs.pinentry-gnome3;
     enableSshSupport = true;
     sshKeys = [ "1F937AC8F77ED74CE24EAAE79B5601F73C6D115F" ];
   };
diff --git a/machines/xps/hardware-configuration.nix b/machines/xps/hardware-configuration.nix
index 39171d9..2765cce 100644
--- a/machines/xps/hardware-configuration.nix
+++ b/machines/xps/hardware-configuration.nix
@@ -62,7 +62,5 @@
   # networking.interfaces.enp0s13f0u1u4u4.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
   services.tlp.enable = true;
 }
diff --git a/machines/xps/home-mandlm.nix b/machines/xps/home-mandlm.nix
index 7030a2e..1f3b090 100644
--- a/machines/xps/home-mandlm.nix
+++ b/machines/xps/home-mandlm.nix
@@ -1,57 +1,62 @@
-{ config, lib, pkgs, user, ... }:
+{ ... }:
 
 {
   services.kanshi = {
     enable = true;
 
-    profiles = {
-      undocked = {
-        outputs = [
-          {
-            criteria = "eDP-1";
-            scale = 1.3;
-            status = "enable";
-          }
-        ];
-      };
+    settings = [
+      {
+        profile = {
+          name = "undocked";
+          outputs = [
+            {
+              criteria = "eDP-1";
+              scale = 1.3;
+              status = "enable";
+            }
+          ];
+        };
+      }
+      {
+        profile = {
+          name = "home_office";
+          outputs = [
+            {
+              criteria = "Samsung Electric Company SMS24A450 H4MCA12738";
+              mode = "1920x1200";
+              scale = 1.0;
+              status = "enable";
+              position = "0,0";
+              transform = "normal";
+            }
+            {
+              criteria = "Samsung Electric Company SMS24A450 H4MCA12730";
+              mode = "1920x1200";
+              scale = 1.0;
+              status = "enable";
+              position = "1920,0";
+              transform = "270";
+            }
+            {
+              criteria = "eDP-1";
+              status = "disable";
+            }
+          ];
+          exec = ''
+            exec swaymsg workspace 0, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
+            exec swaymsg workspace 8, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
+            exec swaymsg workspace 6, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
+            exec swaymsg workspace 4, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
+            exec swaymsg workspace 2, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
 
-      home_office = {
-        outputs = [
-          {
-            criteria = "Samsung Electric Company SMS24A450 H4MCA12738";
-            mode = "1920x1200";
-            scale = 1.0;
-            status = "enable";
-            position = "0,0";
-            transform = "normal";
-          }
-          {
-            criteria = "Samsung Electric Company SMS24A450 H4MCA12730";
-            mode = "1920x1200";
-            scale = 1.0;
-            status = "enable";
-            position = "1920,0";
-            transform = "270";
-          }
-          {
-            criteria = "eDP-1";
-            status = "disable";
-          }
-        ];
-        exec = ''
-          exec swaymsg workspace 0, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
-          exec swaymsg workspace 8, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
-          exec swaymsg workspace 6, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
-          exec swaymsg workspace 4, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
-          exec swaymsg workspace 2, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12738"'
-
-          exec swaymsg workspace 9, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
-          exec swaymsg workspace 7, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
-          exec swaymsg workspace 5, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
-          exec swaymsg workspace 3, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
-          exec swaymsg workspace 1, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
-        '';
-      };
-    };
+            exec swaymsg workspace 9, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
+            exec swaymsg workspace 7, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
+            exec swaymsg workspace 5, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
+            exec swaymsg workspace 3, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
+            exec swaymsg workspace 1, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
+          '';
+        };
+      }
+    ];
   };
 }