From 299a5e0bd6071c04351dc16a82e68e8f0158b48d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 27 Jun 2024 23:02:38 -0400
Subject: [PATCH] Revert "meta: Add attempt at using gnome-mobile"

---
 flake.lock                    | 16 ----------------
 flake.nix                     |  2 --
 hosts/phone/configuration.nix |  5 ++---
 modules/desktop.nix           |  8 ++++----
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index a9aefa57..46567a45 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,21 +146,6 @@
         "type": "github"
       }
     },
-    "gnome-mobile": {
-      "locked": {
-        "lastModified": 1714963121,
-        "narHash": "sha256-L5+alPQZ7oW9Sjf2y4EN6SnXxG0rhexqe1u9LbtERBA=",
-        "owner": "chuangzhu",
-        "repo": "nixpkgs-gnome-mobile",
-        "rev": "56824cb5737d0870ec8ac56c3013d9ae85ee8a98",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chuangzhu",
-        "repo": "nixpkgs-gnome-mobile",
-        "type": "github"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -232,7 +217,6 @@
     },
     "root": {
       "inputs": {
-        "gnome-mobile": "gnome-mobile",
         "home-manager": "home-manager",
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 7c038cd3..52b5017a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,6 @@
       url = "github:donovanglover/mobile-nixos";
       flake = false;
     };
-
-    gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
   };
 
   outputs = { self, nixpkgs, mobile-nixos, ... } @ attrs:
diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix
index bb193fb4..f928ee34 100644
--- a/hosts/phone/configuration.nix
+++ b/hosts/phone/configuration.nix
@@ -4,9 +4,7 @@ let
   inherit (builtins) attrValues;
 in
 {
-  imports = attrValues self.nixosModules ++ attrValues {
-    inherit (self.inputs.gnome-mobile.nixosModules) gnome-mobile;
-  };
+  imports = attrValues self.nixosModules;
 
   nixpkgs.overlays = attrValues {
     inherit (self.overlays) phinger-cursors;
@@ -41,6 +39,7 @@ in
 
     desktop = {
       phone = true;
+      phosh = true;
     };
 
     hardware.keyboardBinds = true;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 5ebc229c..7505deb8 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -53,7 +53,7 @@ in
       };
     };
 
-    i18n.inputMethod = mkIf (!phone) {
+    i18n.inputMethod = mkIf (!phosh) {
       enabled = "fcitx5";
 
       fcitx5 = {
@@ -72,7 +72,7 @@ in
         enable = true;
         excludePackages = [ pkgs.xterm ];
 
-        displayManager.lightdm.enable = mkIf phone false;
+        displayManager.lightdm.enable = mkIf phosh false;
 
         desktopManager.phosh = mkIf phosh {
           enable = true;
@@ -85,7 +85,7 @@ in
         };
       };
 
-      pipewire = mkIf (!phone) {
+      pipewire = mkIf (!phosh) {
         enable = true;
 
         alsa = {
@@ -96,7 +96,7 @@ in
         pulse.enable = true;
       };
 
-      greetd = mkIf (!container && !phone) {
+      greetd = mkIf (!container && !phosh) {
         enable = true;
         restart = false;