meta: Migrate phosh settings to phone config

Currently there are too many serious issues to realistically use
Hyprland on the PinePhone, and Phosh supports most of the features
we need out of the box anyway, so it makes sense to use that full-time
over trying to make something else work.
This commit is contained in:
Donovan Glover 2024-07-18 15:46:25 -04:00
parent 200bbc1c51
commit d092c5f416
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 49 additions and 58 deletions

View File

@ -1,9 +1,14 @@
{ self, pkgs, lib, ... }:
{ self, pkgs, config, lib, ... }:
let
inherit (lib) mkForce;
inherit (lib.gvariant) mkTuple;
inherit (config.modules.system) username;
inherit (builtins) attrValues;
getColorCh = colorName: channel: config.lib.stylix.colors."${colorName}-rgb-${channel}";
rgba = color: transparency: ''rgba(${getColorCh color "r"}, ${getColorCh color "g"}, ${getColorCh color "b"}, ${transparency})'';
bg = ''linear-gradient(${rgba "base00" "0.7"}, ${rgba "base00" "0.7"})'';
in
{
imports = attrValues self.nixosModules;
@ -67,6 +72,31 @@ in
};
};
};
background = {
stylix.targets.gtk.extraCss = /* css */ ''
phosh-lockscreen {
background: ${bg}, url('file:///home/${username}/wall-lock.jpg');
}
phosh-app-grid {
background: ${bg}, url('file:///home/${username}/wall-grid.jpg');
}
phosh-top-panel {
background: ${bg}, url('file:///home/${username}/wall-panel.jpg');
}
phosh-home {
background: ${bg}, url('file:///home/${username}/wall-home.jpg');
}
phosh-lockscreen, phosh-app-grid, phosh-top-panel, phosh-home {
background-size: cover;
background-position: center;
}
'';
};
};
environment.systemPackages = attrValues {
@ -107,10 +137,13 @@ in
hardware.keyboardBinds = true;
};
i18n.inputMethod.enable = mkForce false;
programs = {
calls.enable = true;
cdemu.enable = mkForce false;
hyprland.enable = mkForce false;
};
@ -122,10 +155,25 @@ in
};
services = {
xserver = {
displayManager.lightdm.enable = false;
desktopManager.phosh = {
enable = true;
group = "users";
user = username;
phocConfig = {
xwayland = "immediate";
};
};
};
openssh.enable = true;
udisks2.enable = mkForce false;
pipewire.enable = mkForce false;
greetd.enable = mkForce false;
};
boot = {

View File

@ -1,57 +0,0 @@
{ config, lib, ... }:
let
inherit (lib) mkForce;
inherit (config.modules.system) username;
inherit (builtins) attrValues;
getColorCh = colorName: channel: config.lib.stylix.colors."${colorName}-rgb-${channel}";
rgba = color: transparency: ''rgba(${getColorCh color "r"}, ${getColorCh color "g"}, ${getColorCh color "b"}, ${transparency})'';
bg = ''linear-gradient(${rgba "base00" "0.7"}, ${rgba "base00" "0.7"})'';
in
{
programs.hyprland.enable = mkForce false;
i18n.inputMethod.enable = mkForce false;
services.greetd.enable = mkForce false;
services.xserver = {
displayManager.lightdm.enable = false;
desktopManager.phosh = {
enable = true;
group = "users";
user = username;
phocConfig = {
xwayland = "immediate";
};
};
};
home-manager.sharedModules = attrValues {
background = {
stylix.targets.gtk.extraCss = /* css */ ''
phosh-lockscreen {
background: ${bg}, url('file:///home/${username}/wall-lock.jpg');
}
phosh-app-grid {
background: ${bg}, url('file:///home/${username}/wall-grid.jpg');
}
phosh-top-panel {
background: ${bg}, url('file:///home/${username}/wall-panel.jpg');
}
phosh-home {
background: ${bg}, url('file:///home/${username}/wall-home.jpg');
}
phosh-lockscreen, phosh-app-grid, phosh-top-panel, phosh-home {
background-size: cover;
background-position: center;
}
'';
};
};
}