swap to gtklock
This commit is contained in:
parent
c5c04a8aac
commit
502f41380b
2 changed files with 270 additions and 46 deletions
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
|
|
@ -54,6 +55,15 @@ let
|
|||
'';
|
||||
|
||||
swayosd-client = lib.getExe' pkgs.swayosd "swayosd-client";
|
||||
|
||||
# Stevia normally needs a phoc-only protocol to start.
|
||||
stevia = pkgs.stevia.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ./stevia-optional-device-state.patch ];
|
||||
});
|
||||
|
||||
lock = pkgs.writeShellScript "lock" ''
|
||||
${lib.getExe' pkgs.procps "pidof"} gtklock || exec ${lib.getExe config.programs.gtklock.package}
|
||||
'';
|
||||
in
|
||||
{
|
||||
programs.niri = {
|
||||
|
|
@ -101,15 +111,20 @@ in
|
|||
|
||||
spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../../background.jpg}" "-m" "fill"
|
||||
spawn-at-startup "${lib.getExe grid}"
|
||||
spawn-at-startup "${lib.getExe pkgs.stevia}"
|
||||
spawn-at-startup "${lib.getExe stevia}"
|
||||
spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}"
|
||||
// We log in automatically, so lock straight away.
|
||||
spawn-at-startup "${lock}"
|
||||
|
||||
binds {
|
||||
XF86PowerOff { spawn "${lock}"; }
|
||||
XF86AudioRaiseVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "raise"; }
|
||||
XF86AudioLowerVolume allow-when-locked=true { spawn "${swayosd-client}" "--output-volume" "lower"; }
|
||||
}
|
||||
'';
|
||||
|
||||
quad.session = lib.getExe' niri "niri-session";
|
||||
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "ignore";
|
||||
HandlePowerKeyLongPress = "poweroff";
|
||||
|
|
|
|||
22
modules/mobile/stevia-optional-device-state.patch
Normal file
22
modules/mobile/stevia-optional-device-state.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- a/src/pos-hw-tracker.c
|
||||
+++ b/src/pos-hw-tracker.c
|
||||
@@ -72,7 +72,9 @@
|
||||
gpointer device_state)
|
||||
{
|
||||
self->device_state = device_state;
|
||||
- zphoc_device_state_v1_add_listener (self->device_state, &device_state_listener, self);
|
||||
+ /* Only phoc has the device state protocol. Without it, assume there is no hardware keyboard. */
|
||||
+ if (self->device_state)
|
||||
+ zphoc_device_state_v1_add_listener (self->device_state, &device_state_listener, self);
|
||||
}
|
||||
|
||||
|
||||
--- a/src/pos-wayland.c
|
||||
+++ b/src/pos-wayland.c
|
||||
@@ -387,6 +387,5 @@
|
||||
self->zwlr_foreign_toplevel_manager_v1 &&
|
||||
self->layer_shell &&
|
||||
self->zxdg_output_manager_v1 &&
|
||||
- self->zphoc_device_state_v1 &&
|
||||
self->wlr_data_control_manager);
|
||||
}
|
||||
Loading…
Reference in a new issue