From 44cf7e6832d8f123f0b1012a480a79346660d09d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 16 Jul 2024 12:27:17 -0400
Subject: [PATCH] meta: Move phone-specific apps to host

Might turn this into a module later and use the standard
`module.enable = true` syntax.
---
 hosts/phone/configuration.nix | 23 +++++++++++++++++++++++
 modules/desktop.nix           | 29 +----------------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix
index 483a9358..c10f33e8 100644
--- a/hosts/phone/configuration.nix
+++ b/hosts/phone/configuration.nix
@@ -42,6 +42,29 @@ in
     inherit (self.packages.${pkgs.system})
       webp-thumbnailer
       ;
+    inherit (pkgs.gnome)
+      gnome-contacts
+      gnome-sound-recorder
+      gnome-maps
+      ;
+
+    inherit (pkgs)
+      gurk-rs
+      android-tools
+      chatty
+      gnome-console
+      megapixels
+      fractal
+      g4music
+      livi
+      papers
+      phosh-mobile-settings
+      resources
+      tuba
+      caerbannog
+      eog
+      geary
+    ;
   };
 
   modules = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 5cc7be1a..a80696a5 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -123,37 +123,10 @@ in
           srb2
           ringracers
           jamesdsp
+          texliveFull
           ;
-      }))
 
-      (mkIf (!phone) (attrValues {
         inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
-        inherit (pkgs) texliveFull;
-      }))
-
-      (mkIf phone (attrValues {
-        inherit (pkgs.gnome)
-          gnome-contacts
-          gnome-sound-recorder
-          gnome-maps
-          ;
-        inherit (pkgs)
-          gurk-rs
-          android-tools
-          chatty
-          gnome-console
-          megapixels
-          fractal
-          g4music
-          livi
-          papers
-          phosh-mobile-settings
-          resources
-          tuba
-          caerbannog
-          eog
-          geary
-          ;
       }))
 
       (attrValues {