From 1943a3c679ee23c52ae2e8cd109b116ac66b1a81 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Mon, 12 Jan 2026 00:28:33 -0600
Subject: [PATCH] fix systemd k3s ordering

---
 .forgejo/workflows/main.yaml      |  3 +--
 nixos/consensus/configuration.nix |  7 +++++++
 nixos/t14/configuration.nix       |  2 +-
 nixos/zen/configuration.nix       | 17 ++++++++++++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml
index f7bd657..e561bd0 100644
--- a/.forgejo/workflows/main.yaml
+++ b/.forgejo/workflows/main.yaml
@@ -1,8 +1,7 @@
 on: [push]
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: nix-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
       - run: nix flake check
diff --git a/nixos/consensus/configuration.nix b/nixos/consensus/configuration.nix
index 3d4c42c..bd3b8e6 100644
--- a/nixos/consensus/configuration.nix
+++ b/nixos/consensus/configuration.nix
@@ -23,6 +23,13 @@
     tmux
   ];
   system-net.openssh.ports = [2022];
+  systemd.services.k3s = {
+    preStart = ''
+      until ${pkgs.tailscale}/bin/tailscale status; do
+        sleep 1
+      done
+    '';
+  };
   services = {
     zfs.autoScrub.enable = true;
     zfs.autoSnapshot.enable = true;
diff --git a/nixos/t14/configuration.nix b/nixos/t14/configuration.nix
index 4a6f318..5afa8ee 100755
--- a/nixos/t14/configuration.nix
+++ b/nixos/t14/configuration.nix
@@ -17,6 +17,7 @@ in
       cryptsetup
       nfs-utils
       nerdctl
+      android-tools
       (lib.hiPrio uutils-coreutils-noprefix)
     ];
     extraInit = "[[ -f ${homeManagerSessionVars} ]] && source ${homeManagerSessionVars} && echo 'x' > /tmp/test";
@@ -69,7 +70,6 @@ in
       startAgent = true;
     };
     steam.enable = true;
-    adb.enable = true;
     fish.enable = true; # enable vendor completions
     nh.enable = true;
   };
diff --git a/nixos/zen/configuration.nix b/nixos/zen/configuration.nix
index 6ca9575..3c73c75 100644
--- a/nixos/zen/configuration.nix
+++ b/nixos/zen/configuration.nix
@@ -23,7 +23,10 @@
       ];
     };
   };
-  virtualisation.podman.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    extraOptions = "--dns 1.1.1.1";
+  };
   services.gitea-actions-runner = {
     package = pkgs.forgejo-runner;
     instances.default = {
@@ -34,6 +37,7 @@
       labels = [
         "ubuntu-latest:docker://node:24-bullseye"
         "nix-upstream-latest:docker://nixos/nix:latest"
+        "nix-latest:docker://git.10110110.xyz/ci/nix"
       ];
     };
   };
@@ -46,8 +50,15 @@
     tokenFile = config.sops.secrets."password".path;
     serverAddr = "https://consensus:6443";
   };
-  services.logind.lidSwitch = "ignore";
-  services.logind.lidSwitchExternalPower = "ignore";
+  systemd.services.k3s = {
+    preStart = ''
+      until ${pkgs.tailscale}/bin/tailscale status; do
+        sleep 1
+      done
+    '';
+  };
+  services.logind.settings.Login.HandleLidSwitch = "ignore";
+  services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore";
   hardware.enableRedistributableFirmware = true;
   hardware.firmware = [ pkgs.linux-firmware ];
   system.stateVersion = "23.11";