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

sxmo: port to greetd abstraction

Browse Source
This commit is contained in:
Colin 2023-09-02 00:49:44 +00:00
parent a41fefa906
commit 3cc4a1ea19
2 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hosts/modules/gui/greetd.nix
View File

@ -51,6 +51,7 @@ in
have sway launch gtkgreet instead of directly presenting a desktop.
'';
};
# TODO: follow same structure as the options above...
sane.gui.greetd.sway.gtkgreet.sessionCmd = mkOption {
type = types.string;
description = ''
@ -78,21 +79,14 @@ in
sane.gui.greetd.session = if cfg.sway.greeterCmd != null then {
name = "sway-as-greeter";
command = let
swayAsGreeter = runWithLogger
"sway-as-greeter"
"${pkgs.sway}/bin/sway --debug --config ${swayAsGreeterConfig}";
swayAsGreeterConfig = pkgs.writeText "sway-as-greeter-config" ''
exec ${cfg.sway.greeterCmd}
'';
in "${swayAsGreeter}/bin/sway-as-greeter";
in "${pkgs.sway}/bin/sway --debug --config ${swayAsGreeterConfig}";
} else {
name = "sway";
user = lib.mkDefault "colin";
command = let
swayWithLogging = runWithLogger
"sway"
"${pkgs.sway}/bin/sway --debug";
in "${swayWithLogging}/bin/sway";
command = "${pkgs.sway}/bin/sway --debug";
};
})
(lib.mkIf cfg.sway.gtkgreet.enable (

69
hosts/modules/gui/sxmo/default.nix
View File

@ -90,7 +90,6 @@ in
"lightdm-mobile" => keypad style greeter. can only enter digits 0-9 as password.
"sway-gtkgreet" => layered sway greeter. behaves as if you booted to swaylock.
this isn't practically usable on mobile because of keyboard input.
also, it takes literally 6 minutes to appear
'';
};
sane.gui.sxmo.package = mkOption {
@ -335,77 +334,41 @@ in
})
(lib.mkIf (cfg.greeter == "sway-gtkgreet") {
services.greetd = {
sane.gui.greetd = {
enable = true;
# borrowed from gui/sway
settings.default_session.command =
let
# start sway and have it construct the gtkgreeter
sway-as-greeter = runWithLogger "sway-as-greeter" "${pkgs.sway}/bin/sway --debug --config ${sway-config-into-gtkgreet}";
# (config file for the above)
sway-config-into-gtkgreet = pkgs.writeText "greetd-sway-config" ''
exec "${gtkgreet-launcher}"
'';
# gtkgreet which launches a layered sway instance
gtkgreet-launcher = pkgs.writeShellScript "gtkgreet-launcher" ''
# NB: the "command" field here is run in the user's shell.
# so that command must exist on the specific user's path who is logging in. it doesn't need to exist system-wide.
${pkgs.greetd.gtkgreet}/bin/gtkgreet --layer-shell --command sxmo_winit.sh
'';
in "${sway-as-greeter}";
sway.enable = true;
sway.gtkgreet.enable = true;
sway.gtkgreet.sessionName = "sxmo-on-gtkgreet";
sway.gtkgreet.sessionCmd = "${cfg.package}/bin/sxmo_winit.sh";
};
})
(lib.mkIf (cfg.greeter == "greetd-sway-phog") {
services.greetd = {
sane.gui.greetd = {
enable = true;
# borrowed from gui/sway
settings.default_session.command =
let
# start sway and have it construct the greeter
sway-as-greeter = runWithLogger "sway-as-greeter" "${pkgs.sway}/bin/sway --debug --config ${sway-config-into-phog}";
# (config file for the above)
sway-config-into-phog = pkgs.writeText "greetd-sway-config" ''
exec "${pkgs.phog}/libexec/phog"
'';
in "${sway-as-greeter}";
sway.enable = true;
sway.greeterCmd = "${pkgs.phog}/libexec/phog";
};
# phog locates sxmo_winit.sh via <env>/share/wayland-sessions
environment.pathsToLink = [ "/share/wayland-sessions" ];
# persisting fontconfig & mesa_shader_cache improves start time from like 6 minutes to 1 minute
# TODO: this should apply to any greetd implementation
users.users.greeter.home = "/var/lib/greeter";
sane.persist.sys.plaintext = [
{ user = "greeter"; group = "greeter"; path = "/var/lib/greeter/.cache/fontconfig"; }
{ user = "greeter"; group = "greeter"; path = "/var/lib/greeter/.cache/mesa_shader_cache"; }
];
})
(lib.mkIf (cfg.greeter == "greetd-phog") {
services.greetd = {
sane.gui.greetd = {
enable = true;
# launch directly: but stdout/stderr gets dropped
# settings.default_session.command = "${pkgs.phog}/bin/phog";
# wrapper to launch phog and redirect logs to system journal.
settings.default_session.command = let
launch-phog = runWithLogger "phog" "${pkgs.phog}/bin/phog";
in "${launch-phog}";
session.name = "phog";
session.command = "${pkgs.phog}/bin/phog";
};
# phog locates sxmo_winit.sh via <env>/share/wayland-sessions
environment.pathsToLink = [ "/share/wayland-sessions" ];
})
(lib.mkIf (cfg.greeter == "greetd-sxmo") {
services.greetd = {
sane.gui.greetd = {
enable = true;
settings.default_session = {
command = let
launch-sxmo = runWithLogger "sxmo" "${cfg.package}/bin/sxmo_winit.sh";
in "${launch-sxmo}";
user = "colin";
};
session.name = "sxmo";
session.command = "${cfg.package}/bin/sxmo_winit.sh";
session.user = "colin";
};
})