[boxy] Fix wayland and user setup

roles/desktop/default.nix

@@ -37,7 +37,7 @@ in
     };
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       services.xserver.xkb = {
         layout = "us";

roles/kodi/default.nix

@@ -35,7 +35,7 @@ in
       };
 
       services = if cfg.autologin then mkMerge [
-        mkIf cfg.wayland {
+        (mkIf cfg.wayland {
           cage = mkIf cfg.wayland {
             user = "kodi";
             program = "${kodiPkg}/bin/kodi-standalone";
@@ -45,9 +45,9 @@ in
             enable = false;
             autorun = false;
           };
-        }
+        })
 
-        mkIf (!cfg.wayland) {
+        (mkIf (!cfg.wayland) {
           xserver = {
             enable = true;
             desktopManager.kodi = {
@@ -65,7 +65,7 @@ in
             defaultSession = "kodi";
             sessionData.autologinSession = "kodi";
           };
-        }
+        })
       ] else {};
     };
 }