extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-20 17:57:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

desktop: Don't bloat with phone conditionals

Browse Source 
Should make things easier to manage now that we've technically tried
Hyprland with gestures but prefer Phosh for usability.
This commit is contained in:
Donovan Glover 2024-07-15 11:37:30 -04:00
parent bd1fc2b6f6
commit 9ce417830e
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hosts/phone/configuration.nix
View File

@ -63,8 +63,12 @@ in
}; };
}; };
hardware.graphics.enable32Bit = lib.mkForce false;
virtualisation.virtualbox.host.enable = lib.mkForce false;
programs = { programs = {
calls.enable = true; calls.enable = true;
cdemu.enable = lib.mkForce false;
}; };
services.pipewire.enable = lib.mkForce false; services.pipewire.enable = lib.mkForce false;
@ -76,6 +80,7 @@ in
services = { services = {
openssh.enable = true; openssh.enable = true;
udisks2.enable = lib.mkForce false;
}; };
powerManagement = { powerManagement = {

21
modules/desktop.nix
View File

@ -4,15 +4,11 @@ let
inherit (lib) mkEnableOption mkIf mkMerge mkOption; inherit (lib) mkEnableOption mkIf mkMerge mkOption;
inherit (lib.types) float int; inherit (lib.types) float int;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (cfg) bloat gnome plasma container opacity fontSize graphical phone; inherit (cfg) bloat gnome plasma container opacity fontSize graphical;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji; inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji;
inherit (builtins) attrValues; inherit (builtins) attrValues;
legacyHyprland = pkgs.hyprland.override {
legacyRenderer = true;
};
cfg = config.modules.desktop; cfg = config.modules.desktop;
in in
{ {
@ -33,7 +29,6 @@ in
}; };
bloat = mkEnableOption "GUI applications"; bloat = mkEnableOption "GUI applications";
phone = mkEnableOption "Phone support";
gnome = mkEnableOption "GNOME specialization"; gnome = mkEnableOption "GNOME specialization";
plasma = mkEnableOption "Plasma specialization"; plasma = mkEnableOption "Plasma specialization";
container = mkEnableOption "disable some options for container performance"; container = mkEnableOption "disable some options for container performance";
@ -41,13 +36,13 @@ in
}; };
config = { config = {
hardware.graphics.enable32Bit = mkIf (!phone) true; hardware.graphics.enable32Bit = true;
programs = { programs = {
hyprland.enable = mkIf (!container) true; hyprland.enable = mkIf (!container) true;
cdemu.enable = mkIf (!phone) true; cdemu.enable = true;
thunar = mkIf (!phone) { thunar = {
enable = true; enable = true;
plugins = attrValues { plugins = attrValues {
@ -66,7 +61,7 @@ in
}; };
services = { services = {
udisks2 = mkIf (!phone) { udisks2 = {
enable = true; enable = true;
mountOnMedia = true; mountOnMedia = true;
}; };
@ -76,12 +71,12 @@ in
excludePackages = [ pkgs.xterm ]; excludePackages = [ pkgs.xterm ];
}; };
pipewire = mkIf (!phone) { pipewire = {
enable = true; enable = true;
alsa = { alsa = {
enable = true; enable = true;
support32Bit = mkIf (!phone) true; support32Bit = true;
}; };
pulse.enable = true; pulse.enable = true;
@ -98,7 +93,7 @@ in
}; };
initial_session = { initial_session = {
command = "${if phone then legacyHyprland else pkgs.hyprland}/bin/Hyprland"; command = "${pkgs.hyprland}/bin/Hyprland";
user = username; user = username;
}; };
}; };