From 8be1bd53d3c471b641d3e8ef24811f5305760860 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 4 Jun 2022 23:45:06 +0200
Subject: [PATCH 01/10] wip: first PubSolarOS iso test using the NixOS

test suite:

https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
---
 .drone.yml            | 21 ++++++++++-
 flake.nix             |  6 ++-
 tests/first-test.nix  | 87 +++++++++++++++++++++++++++++++++++++++++++
 tests/second-test.nix | 14 +++++++
 4 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 tests/first-test.nix
 create mode 100644 tests/second-test.nix

diff --git a/.drone.yml b/.drone.yml
index f54bd8f9..57a0aa1c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -103,10 +103,29 @@ steps:
       NIX_FLAGS: "--print-build-logs --verbose"
     commands:
       - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
-      - nix $$NIX_FLAGS flake check
       - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
       - nix $$NIX_FLAGS develop --command echo OK
 
+---
+kind: pipeline
+type: exec
+name: Tests
+
+steps:
+  - name: "Tests"
+    when:
+      event:
+        - pull_request
+        - tag
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
+    commands:
+      - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS build ".#checks.x86_64-linux.customTestFor-PubSolarOS-firstTest"
+      #- nix $$NIX_FLAGS flake check
+      #- nix $$NIX_FLAGS develop --command echo OK
+      #- nix $$NIX_FLAGS develop --command bud --help
+
 ---
 kind: pipeline
 type: docker
diff --git a/flake.nix b/flake.nix
index bf050b2e..b4335a8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -102,7 +102,11 @@
           imports = [ (digga.lib.importHosts ./hosts) ];
           hosts = {
             /* set host specific properties here */
-            PubSolarOS = { };
+            PubSolarOS = {
+              tests = [
+                (import ./tests/first-test.nix { pkgs = nixos.legacyPackages.x86_64-linux; lib = nixos.lib; })
+              ];
+            };
           };
           importables = rec {
             profiles = digga.lib.rakeLeaves ./profiles // {
diff --git a/tests/first-test.nix b/tests/first-test.nix
new file mode 100644
index 00000000..251779a1
--- /dev/null
+++ b/tests/first-test.nix
@@ -0,0 +1,87 @@
+{ pkgs, lib, ... }:
+{
+  name = "firstTest";
+
+  nodes.test-machine = { suites ? null, ... }: {
+    imports = suites.iso;
+
+    home-manager.users.pub-solar.programs.zsh.shellAliases = {
+      test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
+      test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
+    };
+
+    # source: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/tests/sway.nix
+    environment = {
+      # For glinfo and wayland-info:
+      systemPackages = with pkgs; [ mesa-demos wayland-utils alacritty ];
+      # Use a fixed SWAYSOCK path (for swaymsg):
+      variables = {
+        "SWAYSOCK" = "/tmp/sway-ipc.sock";
+        # TODO: Investigate if we can get hardware acceleration to work (via
+        # virtio-gpu and Virgil). We currently have to use the Pixman software
+        # renderer since the GLES2 renderer doesn't work inside the VM (even
+        # with WLR_RENDERER_ALLOW_SOFTWARE):
+        # "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
+        "WLR_RENDERER" = "pixman";
+      };
+
+      # To help with OCR:
+      etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
+        main = {
+          font = "inconsolata:size=14";
+        };
+        colors = rec {
+          foreground = "000000";
+          background = "ffffff";
+          regular2 = foreground;
+        };
+      };
+    };
+
+    fonts.fonts = [ pkgs.inconsolata ];
+
+    # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch:
+    virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
+    virtualisation.cores = 4;
+    virtualisation.memorySize = 2048;
+  };
+
+  enableOCR = true;
+
+  testScript = ''
+    import shlex
+    def swaymsg(command: str, succeed=True):
+        with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)):
+          (machine.succeed if succeed else machine.execute)(
+            f"su - pub-solar -c {shlex.quote('swaymsg -- ' + command)}"
+          )
+
+
+    machine.wait_for_unit("multi-user.target")
+
+    # To check the version:
+    print(machine.succeed("sway --version"))
+
+    # Wait for Sway to complete startup:
+    machine.wait_for_file("/run/user/1000/wayland-1")
+    machine.wait_for_file("/tmp/sway-ipc.sock")
+
+    # Start a terminal (foot) on workspace 3:
+    machine.wait_for_text("1")
+    machine.send_key("meta_l-3")
+    machine.sleep(3)
+    machine.send_key("meta_l-ret")
+    machine.sleep(10)
+    machine.send_chars("whoami\n")
+    machine.sleep(3)
+    machine.wait_for_text("pub-solar")
+    machine.send_chars("test-wayland\n")
+    machine.wait_for_file("/tmp/test-wayland-exit-ok")
+    print(machine.succeed("cat /tmp/test-wayland.out"))
+    machine.copy_from_vm("/tmp/test-wayland.out")
+    machine.sleep(3)
+    machine.screenshot("foot_wayland_info")
+    machine.send_key("meta_l-shift-q")
+    machine.wait_until_fails("pgrep foot")
+  '';
+}
diff --git a/tests/second-test.nix b/tests/second-test.nix
new file mode 100644
index 00000000..d6409820
--- /dev/null
+++ b/tests/second-test.nix
@@ -0,0 +1,14 @@
+{ }:
+{
+  name = "secondTest";
+
+  nodes.test-machine2 = { suites ? null, ... }: {
+    imports = [
+      suites.iso
+    ];
+  };
+
+  testScript = ''
+    machines[0].systemctl("is-system-running --wait")
+  '';
+}

From 472560e1c1507a664e3b8ef479f28228712464ef Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 14 Aug 2022 20:51:56 +0200
Subject: [PATCH 02/10] Restructure CI:

build ISO on each push to main branch

tags with v* and t* names trigger a test VM

pull requests trigger a basic check building host PubSolarOS
---
 .drone.yml | 119 ++++++++---------------------------------------------
 1 file changed, 17 insertions(+), 102 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 57a0aa1c..986eee5c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,92 +1,3 @@
----
-kind: pipeline
-type: docker
-name: Upstreaming
-
-steps:
-  - name: "Sync 'devos' branch with upstream"
-    image: alpine/git
-    when:
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-    environment:
-      GITEA_SSH_KEY:
-        from_secret: gitea_ssh_key
-    commands:
-      - ./.drone/setup_ssh.sh
-      - git remote add devos git@git.b12f.io:pub-solar/devos
-      - git remote set-url origin git@git.b12f.io:pub-solar/os
-      - git fetch --all
-      - git checkout -b devos --track origin/devos
-      - git merge -X theirs devos/main
-      - git push origin devos
-      - git remote set-url origin https://git.b12f.io/pub-solar/os.git
-
-  - name: "Sync $BRANCH with upstream"
-    image: alpine/git
-    when:
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    environment:
-      GITEA_SSH_KEY:
-        from_secret: gitea_ssh_key
-    commands:
-      - git fetch origin
-      - git checkout origin/main
-      - ./.drone/setup_ssh.sh
-      - git remote set-url origin git@git.b12f.io:pub-solar/os
-      - git fetch --all
-      - ./.drone/upstream-branch.sh
-
-  - name: "Open pull request for failed merge"
-    image: nixery.dev/shell/tea
-    when:
-      status:
-        - failure
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    environment:
-      TEA_CONFIG:
-        from_secret: tea_config
-    commands:
-      - mkdir -p ~/.config/tea
-      - echo "$$TEA_CONFIG" > ~/.config/tea/config.yml
-      - tea pulls create --base main --head devos
-
-  - name: "Notify matrix"
-    image: plugins/matrix
-    when:
-      status:
-        - failure
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    settings:
-      homeserver: https://matrix.pub.solar
-      roomid: dfQBqwkhIzrFjMSsxy:pub.solar
-      username:
-        from_secret: matrix_username
-      password:
-        from_secret: matrix_password
-      template: "Upstreaming {{ build.status }} [{{ build.branch }}#{{ truncate build.commit 8 }}]({{ build.link }}) by {{ build.author }}. [Pull requests](https://git.b12f.io/pub-solar/os/pulls)"
-
-trigger:
-  event:
-    - cron
-
 ---
 kind: pipeline
 type: docker
@@ -98,11 +9,11 @@ steps:
     when:
       event:
         - pull_request
-        - tag
     environment:
       NIX_FLAGS: "--print-build-logs --verbose"
     commands:
       - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
+      - nix $$NIX_FLAGS flake show
       - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
       - nix $$NIX_FLAGS develop --command echo OK
 
@@ -113,18 +24,19 @@ name: Tests
 
 steps:
   - name: "Tests"
-    when:
-      event:
-        - pull_request
-        - tag
     environment:
       NIX_FLAGS: "--print-build-logs --verbose"
     commands:
       - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
       - nix $$NIX_FLAGS build ".#checks.x86_64-linux.customTestFor-PubSolarOS-firstTest"
-      #- nix $$NIX_FLAGS flake check
-      #- nix $$NIX_FLAGS develop --command echo OK
-      #- nix $$NIX_FLAGS develop --command bud --help
+      - nix-store --read-log result
+      - nix $$NIX_FLAGS flake check
+      - nix $$NIX_FLAGS develop --command echo OK
+
+trigger:
+  ref:
+    - refs/tags/v*
+    - refs/tags/t*
 
 ---
 kind: pipeline
@@ -134,14 +46,15 @@ name: Publish ISO
 steps:
   - name: "Build ISO"
     image: docker.nix-community.org/nixpkgs/nix-flakes:latest
+    environment:
+      NIX_FLAGS: "--print-build-logs --verbose"
     volumes:
       - name: file-exchange
         path: /var/nix/iso-cache
     commands:
       - |
-        nix --print-build-logs --verbose \
-          build \
-            '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'
+        nix $$NIX_FLAGS build \
+          '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'
       - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
 
   - name: "Publish ISO"
@@ -167,8 +80,10 @@ depends_on:
   - Check
 
 trigger:
+  branch:
+    - main
   event:
-    - tag
+    - push
 
 volumes:
   - name: file-exchange
@@ -176,6 +91,6 @@ volumes:
 
 ---
 kind: signature
-hmac: da951ba8ede88996728acfb47846e01880eb0e3b91f66e47848d6c1cc727c5d9
+hmac: f78042286446a0649b61bdd28240caf7650cf995804acb714b92d145fa028bdf
 
 ...

From 553e23baf9e25a77323b1c06f5e75e37713a4fc0 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 14 Aug 2022 21:40:29 +0200
Subject: [PATCH 03/10] ci: add upload artifacts step

---
 .drone.yml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 986eee5c..84ef47c9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,9 +13,8 @@ steps:
       NIX_FLAGS: "--print-build-logs --verbose"
     commands:
       - 'echo DEBUG: Using NIX_FLAGS: $NIX_FLAGS'
-      - nix $$NIX_FLAGS flake show
+      - nix $$NIX_FLAGS develop --command nix flake show
       - nix $$NIX_FLAGS build ".#nixosConfigurations.PubSolarOS.config.system.build.toplevel"
-      - nix $$NIX_FLAGS develop --command echo OK
 
 ---
 kind: pipeline
@@ -33,6 +32,25 @@ steps:
       - nix $$NIX_FLAGS flake check
       - nix $$NIX_FLAGS develop --command echo OK
 
+  - name: "Upload artifacts"
+    environment:
+      TRITON_DONT_SOURCE_PROFILE: 1
+      PRIVATE_SSH_KEY:
+        from_secret: private_ssh_key
+      MANTA_USER: pub_solar
+      MANTA_URL: https://eu-central.manta.greenbaum.cloud
+      MANTA_KEY_ID: "02:ae:79:2b:8f:7f:51:ba:c6:3c:ea:6f:f7:bb:d1:6a"
+    commands:
+      - export TARGET_DIR="$${DRONE_REPO}/$${DRONE_BUILD_NUMBER}"
+      - echo env var TARGET_DIR is set to $$TARGET_DIR
+      - "mkdir ~/.ssh && chmod 700 ~/.ssh"
+      - echo "$$PRIVATE_SSH_KEY" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
+      - nix flake new --template "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main" ./tritonshell
+      - git add tritonshell
+      - cd tritonshell
+      - nix develop --command mput -p -f ../result/foot_wayland_info.png ~~/public/$${TARGET_DIR}
+      - nix develop --command mput -p -f ../result/test-wayland.out ~~/public/$${TARGET_DIR}
+
 trigger:
   ref:
     - refs/tags/v*
@@ -89,8 +107,13 @@ volumes:
   - name: file-exchange
     temp: {}
 
+---
+kind: secret
+name: private_ssh_key
+data: cSWd6rIg8Z51hD+KMenYPX669qb6PWdh9V80Z1YpED68Ffoy73tWEoBjEs2pKUJpcL8qGxMjj5Ot2TAK6iUs5Qnv+ZKmjvvttgVCfKdHE6ULT+aOPdl3PvvKV6VY5iapE7aXmPF5NWuMe4G6OJiA/IP5U4P4hspAUV4/MlAjiLYDNtfJSXpA/5Hv5PvjuTM2RartUdXLdFe5qXfMFlmFKeU6J9jxf0BFY9lwhniOsxTGo6YQmf0fEqRd6i2AeKN58Oevir3H5rKQvDhCAUmPxT8rEHYoG7sgkt4ow+0gWyLuoimetZHHT/0IKbSWpQV9rfgxMa7L9TvN9pe573dKjFcGpJpbUsaL8O7R/Av6APzcNBWwNArMcD7/nSuj/33bppCJfC3IA5KLrRqi2Tt5nVw7Wm5eYX4iloftCBFsuI2Zj3B9eW4wrKy4k/CvP7klinaoyfGrt48Z3K3JCOUnwaZH/4xTE8+V0UeYEfDjU10etVa27I//sxK/yBRNrX3pRXnwQS997/zW8KHhzh7C4BUNkKj9k2qjxFPRKJp3knbfHlEsirfFcPXoDSRlBHpvDqKzNkxtAA==
+
 ---
 kind: signature
-hmac: f78042286446a0649b61bdd28240caf7650cf995804acb714b92d145fa028bdf
+hmac: 82e3f3690bafae2ff1962ebc24504275dba0dbca707e14b2a389b31a9f7b57c0
 
 ...

From 8feaa494cbafcbd426873fa43b1089cb0354b5ae Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 24 Aug 2022 22:36:53 +0200
Subject: [PATCH 04/10] ci: add matrix notify step, fix ssh key id

---
 .drone.yml | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 84ef47c9..0f6e6f7a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,7 +39,7 @@ steps:
         from_secret: private_ssh_key
       MANTA_USER: pub_solar
       MANTA_URL: https://eu-central.manta.greenbaum.cloud
-      MANTA_KEY_ID: "02:ae:79:2b:8f:7f:51:ba:c6:3c:ea:6f:f7:bb:d1:6a"
+      MANTA_KEY_ID: "5d:5f:3d:22:8d:37:1f:e6:d6:ab:06:18:d9:a2:04:67"
     commands:
       - export TARGET_DIR="$${DRONE_REPO}/$${DRONE_BUILD_NUMBER}"
       - echo env var TARGET_DIR is set to $$TARGET_DIR
@@ -56,6 +56,31 @@ trigger:
     - refs/tags/v*
     - refs/tags/t*
 
+---
+kind: pipeline
+type: docker
+name: Notification
+
+steps:
+  - name: "Notify matrix"
+    image: plugins/matrix
+    settings:
+      homeserver: https://matrix.pub.solar
+      roomid: dfQBqwkhIzrFjMSsxy:pub.solar
+      username:
+        from_secret: matrix_username
+      password:
+        from_secret: matrix_password
+      template: "Test run status: {{ build.status }}, artifacts uploaded to Manta: https://eu-central.manta.greenbaum.cloud/pub_solar/public/{{ repo.Owner }}/{{ repo.Name }}/{{ build.number }}"
+
+depends_on:
+  - Tests
+
+trigger:
+  ref:
+    - refs/tags/v*
+    - refs/tags/t*
+
 ---
 kind: pipeline
 type: docker
@@ -107,13 +132,8 @@ volumes:
   - name: file-exchange
     temp: {}
 
----
-kind: secret
-name: private_ssh_key
-data: cSWd6rIg8Z51hD+KMenYPX669qb6PWdh9V80Z1YpED68Ffoy73tWEoBjEs2pKUJpcL8qGxMjj5Ot2TAK6iUs5Qnv+ZKmjvvttgVCfKdHE6ULT+aOPdl3PvvKV6VY5iapE7aXmPF5NWuMe4G6OJiA/IP5U4P4hspAUV4/MlAjiLYDNtfJSXpA/5Hv5PvjuTM2RartUdXLdFe5qXfMFlmFKeU6J9jxf0BFY9lwhniOsxTGo6YQmf0fEqRd6i2AeKN58Oevir3H5rKQvDhCAUmPxT8rEHYoG7sgkt4ow+0gWyLuoimetZHHT/0IKbSWpQV9rfgxMa7L9TvN9pe573dKjFcGpJpbUsaL8O7R/Av6APzcNBWwNArMcD7/nSuj/33bppCJfC3IA5KLrRqi2Tt5nVw7Wm5eYX4iloftCBFsuI2Zj3B9eW4wrKy4k/CvP7klinaoyfGrt48Z3K3JCOUnwaZH/4xTE8+V0UeYEfDjU10etVa27I//sxK/yBRNrX3pRXnwQS997/zW8KHhzh7C4BUNkKj9k2qjxFPRKJp3knbfHlEsirfFcPXoDSRlBHpvDqKzNkxtAA==
-
 ---
 kind: signature
-hmac: 82e3f3690bafae2ff1962ebc24504275dba0dbca707e14b2a389b31a9f7b57c0
+hmac: b38ea67f7458383c2f7650d86a619efd065b59888d738d4471c83b0a0ad12e3d
 
 ...

From c2e5d8df3c6f01c58ec07f2bf7ce74c16f2f62f5 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 25 Aug 2022 15:42:33 +0200
Subject: [PATCH 05/10] ci: better matrix notify template message,

prefix manta path with ci/ and set target filename for mput
---
 .drone.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0f6e6f7a..0bebe210 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,15 +41,15 @@ steps:
       MANTA_URL: https://eu-central.manta.greenbaum.cloud
       MANTA_KEY_ID: "5d:5f:3d:22:8d:37:1f:e6:d6:ab:06:18:d9:a2:04:67"
     commands:
-      - export TARGET_DIR="$${DRONE_REPO}/$${DRONE_BUILD_NUMBER}"
+      - export TARGET_DIR="ci/$${DRONE_REPO}/$${DRONE_BUILD_NUMBER}"
       - echo env var TARGET_DIR is set to $$TARGET_DIR
       - "mkdir ~/.ssh && chmod 700 ~/.ssh"
       - echo "$$PRIVATE_SSH_KEY" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
       - nix flake new --template "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main" ./tritonshell
       - git add tritonshell
       - cd tritonshell
-      - nix develop --command mput -p -f ../result/foot_wayland_info.png ~~/public/$${TARGET_DIR}
-      - nix develop --command mput -p -f ../result/test-wayland.out ~~/public/$${TARGET_DIR}
+      - nix develop --command mput -p -f ../result/foot_wayland_info.png ~~/public/$${TARGET_DIR}/foot_wayland_info.png
+      - nix develop --command mput -p -f ../result/test-wayland.out ~~/public/$${TARGET_DIR}/test-wayland.out
 
 trigger:
   ref:
@@ -71,7 +71,7 @@ steps:
         from_secret: matrix_username
       password:
         from_secret: matrix_password
-      template: "Test run status: {{ build.status }}, artifacts uploaded to Manta: https://eu-central.manta.greenbaum.cloud/pub_solar/public/{{ repo.Owner }}/{{ repo.Name }}/{{ build.number }}"
+      template: "Test run triggered by tag: {{ build.tag }}. Test run exit status: {{ build.status }}. Artifacts uploaded to Manta: https://eu-central.manta.greenbaum.cloud/pub_solar/public/ci/{{ repo.Owner }}/{{ repo.Name }}/{{ build.number }}/foot_wayland_info.png"
 
 depends_on:
   - Tests
@@ -134,6 +134,6 @@ volumes:
 
 ---
 kind: signature
-hmac: b38ea67f7458383c2f7650d86a619efd065b59888d738d4471c83b0a0ad12e3d
+hmac: c6845bbec339e7ccfdb34889bfd56d25dc2c423eac255eb30f19b8d9e7bf9f1f
 
 ...

From 61220214356b9d719b0cbddc6e878586c3775e1c Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 27 Aug 2022 13:48:32 +0200
Subject: [PATCH 06/10] Bump flake.lock

---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 857bb989..29228dcd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657835815,
-        "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
+        "lastModified": 1661329936,
+        "narHash": "sha256-dafFjAcJPo0SdegK3E+SnTI8CNMgV/bBm/6CeDf82f8=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
+        "rev": "ef0e7f41cdf8fae1d2390c4df246c90a364ed8d9",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
     },
     "latest_2": {
       "locked": {
-        "lastModified": 1660305968,
-        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
+        "lastModified": 1661361016,
+        "narHash": "sha256-Bjf6ZDnDc6glTwIIItvwfcaeJ5zWFM6GYfPajSArdUY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
+        "rev": "b784c5ae63dd288375af1b4d37b8a27dd8061887",
         "type": "github"
       },
       "original": {
@@ -358,11 +358,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1660318005,
-        "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
+        "lastModified": 1661427965,
+        "narHash": "sha256-LJeSDbiebN0/eRt9vyOm+Bxljdsq5ZdalmmTk9Xpp30=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5c211b47aeadcc178c5320afd4e74c7eed5c389f",
+        "rev": "058de3818577db19d1965c21e2479916a3eaaf95",
         "type": "github"
       },
       "original": {
@@ -378,11 +378,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1657748715,
-        "narHash": "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ=",
+        "lastModified": 1660727616,
+        "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "3323b944d99b026aebfd8de439e001409dde067d",
+        "rev": "adccd191a0e83039d537e021f19495b7bad546a1",
         "type": "github"
       },
       "original": {

From 242de215d6801d6858fe935d2ef1170651909d49 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 27 Aug 2022 13:49:55 +0200
Subject: [PATCH 07/10] Switch to our digga fork, include upstream PR

divnix/digga#455 to fix bootstrap iso builds
---
 flake.lock | 11 ++++++-----
 flake.nix  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 29228dcd..794fd6d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -143,15 +143,16 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1659622306,
-        "narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=",
-        "owner": "divnix",
+        "lastModified": 1661600857,
+        "narHash": "sha256-KfQCcTtfvU0PXV4fD9XKIMcKx9lUUR0xWJoBgc12fKE=",
+        "owner": "pub-solar",
         "repo": "digga",
-        "rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c",
+        "rev": "c902b3ef0aa45cb4f336c390f647bb182c38a221",
         "type": "github"
       },
       "original": {
-        "owner": "divnix",
+        "owner": "pub-solar",
+        "ref": "fix/bootstrap-iso",
         "repo": "digga",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index b4335a8d..466d1077 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
       nixos.url = "github:nixos/nixpkgs/nixos-22.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
-      digga.url = "github:divnix/digga";
+      digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
       digga.inputs.nixpkgs.follows = "nixos";
       digga.inputs.nixlib.follows = "nixos";
       digga.inputs.home-manager.follows = "home";

From 209eed069c066b1ae504ae7e43adc4f4f90bcceb Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 29 Aug 2022 11:53:55 +0200
Subject: [PATCH 08/10] Add comment how to build isoImage

---
 hosts/bootstrap.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix
index ba509911..7772b0f1 100644
--- a/hosts/bootstrap.nix
+++ b/hosts/bootstrap.nix
@@ -1,9 +1,6 @@
 { profiles, ... }:
 {
-  # build with: `nix build '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'`
-  # reachable on the local link via ssh root@fe80::47%eno1
-  # where 'eno1' is replaced by your own machine's network
-  # interface that has the local link to the target machine
+  # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
   imports = [
     # profiles.networking
     profiles.users.root # make sure to configure ssh keys

From c1b672fe703a46a50dda2bcbca9f021606d41c0f Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 29 Aug 2022 11:55:20 +0200
Subject: [PATCH 09/10] Fix conflicting definition values, force use of

our defined value.

error: The option 'services.getty.autologinUser' has conflicting definition values:
       - In '/nix/store/zyh8f18z0m1r9jppvdcdivfvfxg0j3fv-source/nixos/modules/profiles/installation-device.nix': "nixos"
       - In '/nix/store/w82qigr5jqv9c6jhdrpdwixydk3rmbzw-source/modules/graphical': "pub-solar"
---
 modules/graphical/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index a506c2ef..ede262b3 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -61,7 +61,7 @@ in
       };
     };
 
-    services.getty.autologinUser = mkIf cfg.autologin.enable "${psCfg.user.name}";
+    services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
 
     qt5 = {
       enable = true;

From 7b5696435a8ec65b4788647c8a3a42f92da58348 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 29 Aug 2022 15:19:07 +0200
Subject: [PATCH 10/10] Fix Build ISO ci step, use

'.#nixosConfigurations.bootstrap.config.system.build.isoImage'
---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0bebe210..a170d5a2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -97,7 +97,7 @@ steps:
     commands:
       - |
         nix $$NIX_FLAGS build \
-          '.#nixosConfigurations.bootstrap.config.system.build.bootstrapIso'
+          '.#nixosConfigurations.bootstrap.config.system.build.isoImage'
       - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
 
   - name: "Publish ISO"
@@ -134,6 +134,6 @@ volumes:
 
 ---
 kind: signature
-hmac: c6845bbec339e7ccfdb34889bfd56d25dc2c423eac255eb30f19b8d9e7bf9f1f
+hmac: 5d7c0ef5519ffe68189271b18d9084db55c9e14831f95234655f5387f9426db0
 
 ...