Revert "meta: Add attempt at using gnome-mobile"

This commit is contained in:
Donovan Glover 2024-06-27 23:02:38 -04:00
parent 961c2f1b62
commit 299a5e0bd6
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
4 changed files with 6 additions and 25 deletions

16
flake.lock generated
View File

@ -146,21 +146,6 @@
"type": "github" "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": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -232,7 +217,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"gnome-mobile": "gnome-mobile",
"home-manager": "home-manager", "home-manager": "home-manager",
"mobile-nixos": "mobile-nixos", "mobile-nixos": "mobile-nixos",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View File

@ -24,8 +24,6 @@
url = "github:donovanglover/mobile-nixos"; url = "github:donovanglover/mobile-nixos";
flake = false; flake = false;
}; };
gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
}; };
outputs = { self, nixpkgs, mobile-nixos, ... } @ attrs: outputs = { self, nixpkgs, mobile-nixos, ... } @ attrs:

View File

@ -4,9 +4,7 @@ let
inherit (builtins) attrValues; inherit (builtins) attrValues;
in in
{ {
imports = attrValues self.nixosModules ++ attrValues { imports = attrValues self.nixosModules;
inherit (self.inputs.gnome-mobile.nixosModules) gnome-mobile;
};
nixpkgs.overlays = attrValues { nixpkgs.overlays = attrValues {
inherit (self.overlays) phinger-cursors; inherit (self.overlays) phinger-cursors;
@ -41,6 +39,7 @@ in
desktop = { desktop = {
phone = true; phone = true;
phosh = true;
}; };
hardware.keyboardBinds = true; hardware.keyboardBinds = true;

View File

@ -53,7 +53,7 @@ in
}; };
}; };
i18n.inputMethod = mkIf (!phone) { i18n.inputMethod = mkIf (!phosh) {
enabled = "fcitx5"; enabled = "fcitx5";
fcitx5 = { fcitx5 = {
@ -72,7 +72,7 @@ in
enable = true; enable = true;
excludePackages = [ pkgs.xterm ]; excludePackages = [ pkgs.xterm ];
displayManager.lightdm.enable = mkIf phone false; displayManager.lightdm.enable = mkIf phosh false;
desktopManager.phosh = mkIf phosh { desktopManager.phosh = mkIf phosh {
enable = true; enable = true;
@ -85,7 +85,7 @@ in
}; };
}; };
pipewire = mkIf (!phone) { pipewire = mkIf (!phosh) {
enable = true; enable = true;
alsa = { alsa = {
@ -96,7 +96,7 @@ in
pulse.enable = true; pulse.enable = true;
}; };
greetd = mkIf (!container && !phone) { greetd = mkIf (!container && !phosh) {
enable = true; enable = true;
restart = false; restart = false;