meta: prefer isPhone over mkForce

This commit is contained in:
Donovan Glover 2024-10-10 14:20:23 -04:00
parent 2e0693f4ce
commit 60401813e6
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 11 additions and 30 deletions

View File

@ -47,25 +47,4 @@ in
phone.enable = true; phone.enable = true;
}; };
i18n.inputMethod.enable = mkForce false;
programs = {
cdemu.enable = mkForce false;
hyprland.enable = mkForce false;
thunar.enable = mkForce false;
};
services = {
udisks2.enable = mkForce false;
pipewire.enable = mkForce false;
greetd.enable = mkForce false;
};
boot = {
binfmt.emulatedSystems = mkForce [ ];
loader.systemd-boot.enable = mkIf (pkgs.system == "aarch64-linux") (mkForce false);
};
hardware.graphics.enable32Bit = mkForce false;
} }

View File

@ -17,6 +17,8 @@ let
inherit (cfg) bloat; inherit (cfg) bloat;
isPhone = config.programs.calls.enable;
cfg = config.modules.desktop; cfg = config.modules.desktop;
in in
{ {
@ -25,14 +27,14 @@ in
}; };
config = { config = {
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = mkIf (!isPhone) true;
programs = { programs = {
hyprland.enable = mkIf (!isContainer) true; hyprland.enable = mkIf (!isContainer && !isPhone) true;
cdemu.enable = true; cdemu.enable = mkIf (!isPhone) true;
thunar = { thunar = {
enable = true; enable = mkIf (!isPhone) true;
plugins = with pkgs.xfce; [ plugins = with pkgs.xfce; [
thunar-volman thunar-volman
@ -40,7 +42,7 @@ in
}; };
}; };
i18n.inputMethod = { i18n.inputMethod = mkIf (!isPhone) {
enable = true; enable = true;
type = "fcitx5"; type = "fcitx5";
@ -54,7 +56,7 @@ in
}; };
services = { services = {
udisks2 = { udisks2 = mkIf (!isPhone) {
enable = true; enable = true;
mountOnMedia = true; mountOnMedia = true;
}; };
@ -78,7 +80,7 @@ in
displayManager.startx.enable = true; displayManager.startx.enable = true;
}; };
pipewire = { pipewire = mkIf (!isPhone) {
enable = true; enable = true;
alsa = { alsa = {
@ -89,7 +91,7 @@ in
pulse.enable = true; pulse.enable = true;
}; };
greetd = mkIf (!isContainer) { greetd = mkIf (!isContainer && !isPhone) {
enable = true; enable = true;
restart = false; restart = false;

View File

@ -90,7 +90,7 @@ in
binfmt.emulatedSystems = [ "aarch64-linux" ]; binfmt.emulatedSystems = [ "aarch64-linux" ];
loader = { loader = {
systemd-boot = { systemd-boot = mkIf (!isPhone) {
enable = true; enable = true;
editor = false; editor = false;
configurationLimit = 10; configurationLimit = 10;