colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

phosh: specify dependent packages more idiomatically

This commit is contained in:
Colin 2023-02-03 22:55:39 +00:00
parent 9b2e7b02cc
commit f2e8be3bd1
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hosts/modules/gui/phosh.nix
View File

@ -20,9 +20,22 @@ in
};
};
config = mkIf cfg.enable (mkMerge [
config = mkMerge [
{
sane.programs.phoshApps = {
package = null;
suggestedPrograms = [
"guiApps"
"phosh-mobile-settings"
# TODO: see about removing gnome-bluetooth if the in-built gnome-settings bluetooth manager can work
"gnome.gnome-bluetooth"
];
};
}
(mkIf cfg.enable {
sane.gui.enable = true;
sane.programs.phoshApps.enableFor.user.colin = true;
# docs: https://github.com/NixOS/nixpkgs/blob/nixos-22.05/nixos/modules/services/x11/desktop-managers/phosh.nix
services.xserver.desktopManager.phosh = {
@ -76,16 +89,9 @@ in
'';
})
];
})
# TODO: refactor
sane.programs = {
phosh-mobile-settings.enableFor.user.colin = true;
# TODO: see about removing this if the in-built gnome-settings bluetooth manager can work
"gnome.gnome-bluetooth".enableFor.user.colin = true;
};
}
(mkIf cfg.useGreeter {
(mkIf (cfg.enable && cfg.useGreeter) {
services.xserver.enable = true;
# NB: setting defaultSession has the critical side-effect that it lets org.freedesktop.AccountsService
# know that our user exists. this ensures lightdm succeeds when calling /org/freedesktop/AccountsServices ListCachedUsers
@ -111,5 +117,5 @@ in
systemd.services.phosh.wantedBy = lib.mkForce []; # disable auto-start
})
]);
];
}