Compare commits

..

4 Commits

Author SHA1 Message Date
458bcb4cdf [roles] Remove unused trusted public key 2024-10-05 19:12:49 -07:00
40e10bab34 [roles] Remove unused config option 2024-10-05 19:12:38 -07:00
3477a3480f [boxy] Fix wayland and user setup 2024-10-05 19:10:15 -07:00
d2ae7f8e11 [roles] Also make desktop opt-in 2024-10-05 19:09:58 -07:00
3 changed files with 6 additions and 16 deletions

View File

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

View File

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

View File

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