diff --git a/config/profiles/hardware/x270.nix b/config/profiles/hardware/x270.nix
index 4c4eb101..65c72bea 100644
--- a/config/profiles/hardware/x270.nix
+++ b/config/profiles/hardware/x270.nix
@@ -18,7 +18,7 @@
     waybarExtend = { config, ... }: {
       options = {
         programs.waybar.settings = mkOption {
-          type = with types; listOf (submodule waybarExtend2);
+          type = with types; either (listOf (submodule waybarExtend2)) (attrsOf (submodule waybarExtend2));
         };
       };
     };
diff --git a/config/users/kat/gui/packages.nix b/config/users/kat/gui/packages.nix
index 21131ab2..9992e5b1 100644
--- a/config/users/kat/gui/packages.nix
+++ b/config/users/kat/gui/packages.nix
@@ -23,7 +23,7 @@
     baresip
     yubikey-manager
     jmtpfs
+    element-desktop
     cryptsetup
-  ] ++ lib.optional config.wayland.windowManager.sway.enable element-wayland
-  ++ lib.optional config.xsession.windowManager.i3.enable element-desktop;
+  ];
 }