From 9ce417830e105f41b0e512e171905b030ad7b126 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Mon, 15 Jul 2024 11:37:30 -0400
Subject: [PATCH] desktop: Don't bloat with phone conditionals

Should make things easier to manage now that we've technically tried
Hyprland with gestures but prefer Phosh for usability.
---
 hosts/phone/configuration.nix |  5 +++++
 modules/desktop.nix           | 21 ++++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix
index 0a97d925..1cf9747d 100644
--- a/hosts/phone/configuration.nix
+++ b/hosts/phone/configuration.nix
@@ -63,8 +63,12 @@ in
     };
   };
 
+  hardware.graphics.enable32Bit = lib.mkForce false;
+  virtualisation.virtualbox.host.enable = lib.mkForce false;
+
   programs = {
     calls.enable = true;
+    cdemu.enable = lib.mkForce false;
   };
 
   services.pipewire.enable = lib.mkForce false;
@@ -76,6 +80,7 @@ in
 
   services = {
     openssh.enable = true;
+    udisks2.enable = lib.mkForce false;
   };
 
   powerManagement = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index da9087a7..c3a1b99d 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -4,15 +4,11 @@ let
   inherit (lib) mkEnableOption mkIf mkMerge mkOption;
   inherit (lib.types) float int;
   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 (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji;
   inherit (builtins) attrValues;
 
-  legacyHyprland = pkgs.hyprland.override {
-    legacyRenderer = true;
-  };
-
   cfg = config.modules.desktop;
 in
 {
@@ -33,7 +29,6 @@ in
     };
 
     bloat = mkEnableOption "GUI applications";
-    phone = mkEnableOption "Phone support";
     gnome = mkEnableOption "GNOME specialization";
     plasma = mkEnableOption "Plasma specialization";
     container = mkEnableOption "disable some options for container performance";
@@ -41,13 +36,13 @@ in
   };
 
   config = {
-    hardware.graphics.enable32Bit = mkIf (!phone) true;
+    hardware.graphics.enable32Bit = true;
 
     programs = {
       hyprland.enable = mkIf (!container) true;
-      cdemu.enable = mkIf (!phone) true;
+      cdemu.enable = true;
 
-      thunar = mkIf (!phone) {
+      thunar = {
         enable = true;
 
         plugins = attrValues {
@@ -66,7 +61,7 @@ in
     };
 
     services = {
-      udisks2 = mkIf (!phone) {
+      udisks2 = {
         enable = true;
         mountOnMedia = true;
       };
@@ -76,12 +71,12 @@ in
         excludePackages = [ pkgs.xterm ];
       };
 
-      pipewire = mkIf (!phone) {
+      pipewire = {
         enable = true;
 
         alsa = {
           enable = true;
-          support32Bit = mkIf (!phone) true;
+          support32Bit = true;
         };
 
         pulse.enable = true;
@@ -98,7 +93,7 @@ in
           };
 
           initial_session = {
-            command = "${if phone then legacyHyprland else pkgs.hyprland}/bin/Hyprland";
+            command = "${pkgs.hyprland}/bin/Hyprland";
             user = username;
           };
         };