b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request 'Fixes for hosts rebuilding with ISO config, fixes for swaylock, swayidle' (#128) from fix/iso-hosts-swaylock-swayidle into main

Browse source 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/128
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
This commit is contained in:
teutat3s 2022-09-01 13:29:15 +00:00
parent 0ce3a30211 1767dcb076
commit 0c11e9119e
No known key found for this signature in database
GPG key ID: 5FEAFA6A0FC8075D
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -92,7 +92,10 @@
imports = [ (digga.lib.importExportableModules ./modules) ]; imports = [ (digga.lib.importExportableModules ./modules) ];
modules = [ modules = [
{ lib.our = self.lib; } { lib.our = self.lib; }
digga.nixosModules.bootstrapIso # FIXME: upstream module causes a huge number of unnecessary
# dependencies to be pulled in for all systems -- many of them are
# graphical. should only be imported as needed.
# digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
home.nixosModules.home-manager home.nixosModules.home-manager
agenix.nixosModules.age agenix.nixosModules.age

4
modules/sway/swayidle.service.nix
View file

@ -12,11 +12,11 @@
Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin"; Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin";
ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \ ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
after-resume 'swaymsg "output * dpms on"' \ after-resume 'swaymsg "output * dpms on"' \
before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \ before-sleep '${pkgs.swaylock-bg}/bin/swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
timeout 150 'systemctl hibernate' timeout 150 'systemctl hibernate'
'' else '' \ '' else '' \
timeout 600 'swaylock-bg' timeout 600 '${pkgs.swaylock-bg}/bin/swaylock-bg' \
timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
''); '');
}; };

9
pkgs/swaylock-bg.nix
View file

@ -3,18 +3,17 @@ self: with self; ''
# swaylock # swaylock
# Make sure we aren't running twice # Make sure we aren't running twice
RUNNING=$(ps -A | grep swaylock | wc -l) RUNNING=$(${procps}/bin/pgrep -c ${swaylock}/bin/swaylock)
if [ $RUNNING -ne 0 ]; then if [ "$RUNNING" -ne 0 ]; then
exit 0 exit 0
fi fi
IMAGE=$XDG_CONFIG_HOME/wallpaper.jpg IMAGE="$XDG_CONFIG_HOME/wallpaper.jpg"
LOCKARGS="" LOCKARGS=""
for OUTPUT in `${sway}/bin/swaymsg -t get_outputs | jq -r '.[].name'` for OUTPUT in $(${sway}/bin/swaymsg -t get_outputs | ${jq}/bin/jq -r '.[].name')
do do
LOCKARGS="''${LOCKARGS} --image ''${OUTPUT}:''${IMAGE}" LOCKARGS="''${LOCKARGS} --image ''${OUTPUT}:''${IMAGE}"
IMAGES="''${IMAGES} ''${IMAGE}"
done done
exec ${swaylock}/bin/swaylock $LOCKARGS exec ${swaylock}/bin/swaylock $LOCKARGS
'' ''