iofq/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix systemd k3s ordering
Some checks failed
/ check (push) Failing after 35s
Details

Browse source
This commit is contained in:
iofq 2026-01-12 00:28:33 -06:00
parent f7cc6dab30
commit 1943a3c679
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.forgejo/workflows/main.yaml
View file

@ -1,8 +1,7 @@
on: [push] on: [push]
jobs: jobs:
check: check:
runs-on: ubuntu-latest runs-on: nix-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- run: nix flake check - run: nix flake check

7
nixos/consensus/configuration.nix
View file

@ -23,6 +23,13 @@
tmux tmux
]; ];
system-net.openssh.ports = [2022]; system-net.openssh.ports = [2022];
systemd.services.k3s = {
preStart = ''
until ${pkgs.tailscale}/bin/tailscale status; do
sleep 1
done
'';
};
services = { services = {
zfs.autoScrub.enable = true; zfs.autoScrub.enable = true;
zfs.autoSnapshot.enable = true; zfs.autoSnapshot.enable = true;

2
nixos/t14/configuration.nix
View file

@ -17,6 +17,7 @@ in
cryptsetup cryptsetup
nfs-utils nfs-utils
nerdctl nerdctl
android-tools
(lib.hiPrio uutils-coreutils-noprefix) (lib.hiPrio uutils-coreutils-noprefix)
]; ];
extraInit = "[[ -f ${homeManagerSessionVars} ]] && source ${homeManagerSessionVars} && echo 'x' > /tmp/test"; extraInit = "[[ -f ${homeManagerSessionVars} ]] && source ${homeManagerSessionVars} && echo 'x' > /tmp/test";
@ -69,7 +70,6 @@ in
startAgent = true; startAgent = true;
}; };
steam.enable = true; steam.enable = true;
adb.enable = true;
fish.enable = true; # enable vendor completions fish.enable = true; # enable vendor completions
nh.enable = true; nh.enable = true;
}; };

17
nixos/zen/configuration.nix
View file

@ -23,7 +23,10 @@
]; ];
}; };
}; };
virtualisation.podman.enable = true; virtualisation.docker = {
enable = true;
extraOptions = "--dns 1.1.1.1";
};
services.gitea-actions-runner = { services.gitea-actions-runner = {
package = pkgs.forgejo-runner; package = pkgs.forgejo-runner;
instances.default = { instances.default = {
@ -34,6 +37,7 @@
labels = [ labels = [
"ubuntu-latest:docker://node:24-bullseye" "ubuntu-latest:docker://node:24-bullseye"
"nix-upstream-latest:docker://nixos/nix:latest" "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; tokenFile = config.sops.secrets."password".path;
serverAddr = "https://consensus:6443"; serverAddr = "https://consensus:6443";
}; };
services.logind.lidSwitch = "ignore"; systemd.services.k3s = {
services.logind.lidSwitchExternalPower = "ignore"; 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.enableRedistributableFirmware = true;
hardware.firmware = [ pkgs.linux-firmware ]; hardware.firmware = [ pkgs.linux-firmware ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";