axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' into teutat3s

Browse source
This commit is contained in:
teutat3s 2022-09-01 15:29:52 +02:00
parent 9ef3d58d2e 0c11e9119e
commit 63080c4d4f
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.drone.yml
View file

@ -107,13 +107,13 @@ steps:
path: /var/nix/iso-cache path: /var/nix/iso-cache
settings: settings:
host: host:
from_secret: ssh_host from_secret: iso_web_ssh_host
user: user:
from_secret: ssh_user from_secret: iso_web_ssh_user
port: port:
from_secret: ssh_port from_secret: iso_web_ssh_port
key: key:
from_secret: ssh_key from_secret: iso_web_ssh_key
target: /srv/os target: /srv/os
source: source:
- /var/nix/iso-cache/*.iso - /var/nix/iso-cache/*.iso
@ -134,6 +134,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 5d7c0ef5519ffe68189271b18d9084db55c9e14831f95234655f5387f9426db0 hmac: 2b930bb5fe02006203b7c2fae8af75814749e8cec5f976ec0d6e64eae1b0c5db
... ...

5
flake.nix
View file

@ -107,7 +107,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
'' ''