wip

roles/default.nix

@@ -1,7 +1,10 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
+let
+  cfg = config.roles;
+in
 {
   imports = [
     ./audio
@@ -16,6 +19,10 @@ with lib;
     ./virtualisation
   ];
 
+  options.roles = {
+    enable = mkEnableOption "Enable roles";
+  };
+
   config = {
     i18n.defaultLocale = "en_US.UTF-8";
     i18n.extraLocaleSettings = {
@@ -58,6 +65,9 @@ with lib;
         substituters = [
           "https://hyprland.cachix.org"
         ];
+        trusted-public-keys = [
+          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        ];
       };
     };
 

roles/desktop/default.nix

@@ -37,7 +37,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable
+  config =
     {
       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 {};
     };
 }