diff --git a/flake.lock b/flake.lock
index 562a3c01..0a8b0a6c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710169806,
-        "narHash": "sha256-HeWFrRuHpnAiPmIr26OKl2g142HuGerwoO/XtW53pcI=",
+        "lastModified": 1710427903,
+        "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "fe064a639319ed61cdf12b8f6eded9523abcc498",
+        "rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710164657,
-        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
+        "lastModified": 1710532761,
+        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
+        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
     },
     "nixpkgs-23.11": {
       "locked": {
-        "lastModified": 1710162809,
-        "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
+        "lastModified": 1710565619,
+        "narHash": "sha256-xu/EnZCNdIj7m/QjCNIG5vrCA4TYg5uwFReb9XDxET0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
+        "rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1709961763,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "lastModified": 1710451336,
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
diff --git a/modules/editions/server.nix b/modules/editions/server.nix
index 4d13eafb..c7a69bbd 100644
--- a/modules/editions/server.nix
+++ b/modules/editions/server.nix
@@ -1,6 +1,5 @@
-{ inputs, trilby, lib, ... }:
+{ inputs, ... }:
 
-lib.optionalAttrs (trilby.edition == "server")
 {
   imports = with inputs.self.nixosModules; [
     profiles.base
diff --git a/modules/editions/workstation.nix b/modules/editions/workstation.nix
index f5f61203..740cce6d 100644
--- a/modules/editions/workstation.nix
+++ b/modules/editions/workstation.nix
@@ -1,6 +1,5 @@
-{ inputs, trilby, lib, ... }:
+{ inputs, trilby, lib, pkgs, ... }:
 
-lib.optionalAttrs (trilby.edition == "workstation")
 {
   imports = with inputs.self.nixosModules; [
     profiles.base
@@ -25,6 +24,12 @@ lib.optionalAttrs (trilby.edition == "workstation")
     usbmuxd.enable = true;
     xserver.enable = true;
   };
+
   powerManagement.enable = true;
+
   security.rtkit.enable = true;
+} //
+lib.optionalAttrs (lib.versionAtLeast trilby.release "24.05") {
+  # Both Gnome and Sway declare this as default, so let's resolve the ambiguity.
+  programs.gnupg.agent.pinentryPackage = pkgs.unstable.pinentry-gnome3;
 }
diff --git a/trilby-cli/flake.nix b/trilby-cli/flake.nix
index bbfa363e..0dfee6b6 100644
--- a/trilby-cli/flake.nix
+++ b/trilby-cli/flake.nix
@@ -73,7 +73,7 @@
                 }
               );
           };
-         })
+        })
       ];
     in
     foreach inputs.nixpkgs.legacyPackages