From 2fa84ab4aae51a50218344e177e9009bb9cbeba1 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 29 Aug 2022 16:47:31 +0200
Subject: [PATCH 1/5] Use more descriptive drone secret names

---
 .drone.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

From b7ba1b7ba9b87c7a60e3f2fe4772d8579b0ed711 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 1 Sep 2022 14:34:57 +0200
Subject: [PATCH 2/5] Fix hosts rebuilding with ISO config after #125

See: https://github.com/divnix/digga/pull/455#issuecomment-1231789444

Upstream fix found in https://github.com/montchr/dotfield/blob/e1b09712fef297ee6173f7010787cd5b2b574a17/nixos/default.nix#L85-L88
---
 flake.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 466d1077..41cd4ff2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,7 +92,10 @@
             imports = [ (digga.lib.importExportableModules ./modules) ];
             modules = [
               { 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
               home.nixosModules.home-manager
               agenix.nixosModules.age

From d563b1d469a0a8bd2e170f450e8c6e790ee4efb9 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 1 Sep 2022 14:37:14 +0200
Subject: [PATCH 3/5] Fix swaylock-bg, now a bash script

- reference jq from pkgs
- shellcheck fixes
---
 pkgs/swaylock-bg.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/swaylock-bg.nix b/pkgs/swaylock-bg.nix
index b55c32ae..75bcd7de 100644
--- a/pkgs/swaylock-bg.nix
+++ b/pkgs/swaylock-bg.nix
@@ -3,18 +3,17 @@ self: with self; ''
   # swaylock
 
   # Make sure we aren't running twice
-  RUNNING=$(ps -A | grep swaylock | wc -l)
-  if [ $RUNNING -ne 0 ]; then
+  RUNNING=$(${procps}/bin/pgrep -c ${swaylock}/bin/swaylock)
+  if [ "$RUNNING" -ne 0 ]; then
     exit 0
   fi
 
-  IMAGE=$XDG_CONFIG_HOME/wallpaper.jpg
+  IMAGE="$XDG_CONFIG_HOME/wallpaper.jpg"
   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
       LOCKARGS="''${LOCKARGS} --image ''${OUTPUT}:''${IMAGE}"
-      IMAGES="''${IMAGES} ''${IMAGE}"
   done
   exec ${swaylock}/bin/swaylock $LOCKARGS
 ''

From 1767dcb0763cbfeed673200602b20e11c465da35 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 1 Sep 2022 14:38:10 +0200
Subject: [PATCH 4/5] Fix swayidle service

- add missing \
- reference swaylock-bg script from pkgs
---
 modules/sway/swayidle.service.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/sway/swayidle.service.nix b/modules/sway/swayidle.service.nix
index f10675fb..685d0f1d 100644
--- a/modules/sway/swayidle.service.nix
+++ b/modules/sway/swayidle.service.nix
@@ -12,11 +12,11 @@
     Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin";
     ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
         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 150 'systemctl hibernate'
       '' else '' \
-        timeout 600 'swaylock-bg'
+        timeout 600 '${pkgs.swaylock-bg}/bin/swaylock-bg' \
         timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
       '');
   };

From 0fbabc23b921fa8ac8ac5647d1ff6b5a360b70c4 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 1 Sep 2022 15:35:04 +0200
Subject: [PATCH 5/5] bootstap: host needs digga's bootstrapIso module

---
 flake.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flake.nix b/flake.nix
index 41cd4ff2..4ac60e8a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,6 +105,11 @@
           imports = [ (digga.lib.importHosts ./hosts) ];
           hosts = {
             /* set host specific properties here */
+            bootstrap = {
+              modules = [
+                digga.nixosModules.bootstrapIso
+              ];
+            };
             PubSolarOS = {
               tests = [
                 (import ./tests/first-test.nix { pkgs = nixos.legacyPackages.x86_64-linux; lib = nixos.lib; })