diff --git a/home-manager/linux/programs/desktop/locking.nix b/home-manager/linux/programs/desktop/locking.nix
index e1ac2f1..7324749 100644
--- a/home-manager/linux/programs/desktop/locking.nix
+++ b/home-manager/linux/programs/desktop/locking.nix
@@ -3,13 +3,16 @@ let
   swaylock-package = config.nathan.config.desktop.swaylock.package;
   swaylock-command = config.nathan.config.desktop.swaylock.command;
   targets = config.nathan.config.desktop.targets;
+  hyprland = config.nathan.programs.hyprland.enable;
 in lib.mkMerge [
-  (lib.mkIf config.nathan.programs.hyprland.enable {
+  # Hyprland specific
+  (lib.mkIf hyprland {
     wayland.windowManager.hyprland.extraConfig = ''
       bind = SUPER, Z, exec, ${swaylock-package}/bin/swaylock ${swaylock-command}
     '';
   })
-  ({
+  # General
+  (lib.mkIf hyprland {
     home.packages = with pkgs; [ swaylock-package swayidle ];
 
     services.swayidle = {
diff --git a/home-manager/linux/programs/desktop/waybar.nix b/home-manager/linux/programs/desktop/waybar.nix
index bc0851b..9cf09d1 100644
--- a/home-manager/linux/programs/desktop/waybar.nix
+++ b/home-manager/linux/programs/desktop/waybar.nix
@@ -2,7 +2,8 @@
 let
   fuzzel-command = config.nathan.config.desktop.fuzzel-command;
   targets = config.nathan.config.desktop.targets;
-in {
+  hyprland = config.nathan.programs.hyprland.enable;
+in lib.mkIf hyprland {
   #########################
   ## Waybar
   #########################