[i3+sway] Fix terminal reference

home/modules/i3+sway/default.nix

@@ -6,13 +6,13 @@ let
   cfg = config.home.i3_sway;
   i3_cfg = config.xsession.windowManager.i3.config;
 
-  shared_config = recursiveUpdate {
+  shared_config = recursiveUpdate rec {
     modifier = "Mod4";
     terminal = "kitty";
     defaultWorkspace = "workspace number 1";
 
     keybindings = {
-      "${shared_config.modifier}+Return" = "exec ${i3_cfg.terminal}";
+      "${shared_config.modifier}+Return" = "exec ${terminal}";
       "${shared_config.modifier}+Shift+q" = "kill";
       "${shared_config.modifier}+d" = "exec ${i3_cfg.menu}";
 

roles/default.nix

@@ -1,10 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
-let
-  cfg = config.roles;
-in
 {
   imports = [
     ./audio
@@ -19,10 +16,6 @@ in
     ./virtualisation
   ];
 
-  options.roles = {
-    enable = mkEnableOption "Enable roles";
-  };
-
   config = {
     i18n.defaultLocale = "en_US.UTF-8";
     i18n.extraLocaleSettings = {
@@ -65,9 +58,6 @@ in
         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 =
+  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 {};
     };
 }