diff --git a/.github/actions/clean-disk/action.yml b/.github/actions/clean-disk/action.yml
index 6578c91..a716dce 100644
--- a/.github/actions/clean-disk/action.yml
+++ b/.github/actions/clean-disk/action.yml
@@ -1,11 +1,11 @@
-name: 'Maximize build disk space'
-description: 'Maximize the available disk space by removing unneeded software'
+name: "Maximize build disk space"
+description: "Maximize the available disk space by removing unneeded software"
inputs:
purge-packages:
description: whether to remove apt packages
required: false
- default: 'false'
+ default: "false"
runs:
using: "composite"
@@ -13,54 +13,53 @@ runs:
- name: Disk space report before modification
shell: bash
run: |
- echo "==> Available space before cleanup"
- echo
- df -h
+ echo "==> Available space before cleanup"
+ echo
+ df -h
- name: Maximize build disk space
shell: bash
run: |
- set -xeuo pipefail
- shopt -s globstar
+ set -xeuo pipefail
+ shopt -s globstar
- non_manifest_packages() {
- comm -2 -3 \
- <(sudo apt-mark showmanual | sort -u) \
- <(grep --perl-regexp --only-matching '^[\w-.+]+' "${{ github.action_path }}"/ubuntu-24.04.1-live-server-amd64.manifest | sort -u)
- }
+ non_manifest_packages() {
+ comm -2 -3 \
+ <(sudo apt-mark showmanual | sort -u) \
+ <(grep --perl-regexp --only-matching '^[\w-.+]+' "${{ github.action_path }}"/ubuntu-24.04.1-live-server-amd64.manifest | sort -u)
+ }
- echo "Removing unwanted software... "
+ echo "Removing unwanted software... "
- if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
- sudo apt-get purge \
- --allow-remove-essential \
- $(non_manifest_packages)
- fi
+ if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
+ sudo apt-get purge \
+ --allow-remove-essential \
+ $(non_manifest_packages)
+ fi
- sudo rm -rf \
- /var/lib/docker/ \
- "$AGENT_TOOLSDIRECTORY" \
- /opt &
+ sudo rm -rf \
+ /var/lib/docker/ \
+ "$AGENT_TOOLSDIRECTORY" \
+ /opt &
- sudo find /usr/{share,local} \
- -mindepth 1 -maxdepth 1 \
- -type d \
- -not -wholename '/usr/share/git-core' \
- -exec rm -rf {} + &
+ sudo find /usr/{share,local} \
+ -mindepth 1 -maxdepth 1 \
+ -type d \
+ -not -wholename '/usr/share/git-core' \
+ -exec rm -rf {} + &
- {
- sudo swapoff -a
- sudo rm -f /mnt/swapfile
- } &
-
- wait
- echo "... done"
+ {
+ sudo swapoff -a
+ sudo rm -f /mnt/swapfile
+ } &
+ wait
+ echo "... done"
- name: Disk space report after modification
shell: bash
run: |
- echo "==> Available space after cleanup"
- echo
- df -h
+ echo "==> Available space after cleanup"
+ echo
+ df -h
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index dfd0e30..0f96f8d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,7 +2,6 @@
version: 2
updates:
-
- package-ecosystem: "github-actions"
directory: "/"
schedule:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2f4343..2a72a47 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,19 +4,19 @@ on:
workflow_dispatch:
inputs:
hosts:
- description: 'list of hosts to build'
+ description: "list of hosts to build"
required: true
- default: 'othalan,algiz'
+ default: "othalan,algiz"
type: string
lockFile:
- description: 'flake.lock file'
+ description: "flake.lock file"
type: string
workflow_call:
inputs:
hosts:
- description: 'list of hosts to build'
- default: ',othalan,algiz'
+ description: "list of hosts to build"
+ default: ",othalan,algiz"
type: string
concurrency:
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 33c68d9..863599f 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -5,7 +5,7 @@ on:
workflow_dispatch:
inputs:
lockFile:
- description: 'flake.lock file'
+ description: "flake.lock file"
type: string
jobs:
@@ -23,7 +23,6 @@ jobs:
extra-conf: |
accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v8
-
- uses: cachix/cachix-action@v15
with:
name: daylin
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 0f12e40..e576f57 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -6,7 +6,7 @@ on:
# - '**/*.md'
pull_request:
paths-ignore:
- - '**/*.md'
+ - "**/*.md"
branches:
- main
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 9703181..21e3899 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -4,11 +4,11 @@ on:
workflow_dispatch:
inputs:
hosts:
- description: 'list of hosts to build'
+ description: "list of hosts to build"
required: true
- default: 'othalan,algiz'
+ default: "othalan,algiz"
type: string
-
+
# schedule:
# # At minute 00:00 on Monday, Wednesday, and Friday.
# - cron: 0 0 * * 1,3,5
@@ -65,7 +65,6 @@ jobs:
with:
push-args: --set-upstream --force origin flake-lock
-
build-full:
needs: build-minimal
runs-on: ubuntu-latest
@@ -110,4 +109,4 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: summary
- path: '*-summary.md'
+ path: "*-summary.md"
diff --git a/.sops.yaml b/.sops.yaml
index e8fdccd..b0fd38b 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -9,11 +9,11 @@ keys:
creation_rules:
- path_regex: hosts/othalan/[^/]+\.(yaml|json|env|ini)$
key_groups:
- - age:
- - *admin_daylin
- - *host_othalan
+ - age:
+ - *admin_daylin
+ - *host_othalan
- path_regex: hosts/algiz/[^/]+\.(yaml|json|env|ini)$
key_groups:
- - age:
- - *host_algiz
- - *admin_daylin
+ - age:
+ - *host_algiz
+ - *admin_daylin
diff --git a/README.md b/README.md
index 53bbf47..d65e229 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,6 @@ See below for the currently maintained hosts.
-
## oizys cli
A small helper utility that mostly just wraps `nix` commands for convenience.
@@ -58,14 +57,14 @@ usage:
oizys subcmd [flags]
subcommands:
- build nix build
- cache build and push store paths
- ci builtin ci
- gha trigger GHA
- dry dry run build
+ build nix build
+ cache build and push store paths
+ ci builtin ci
+ gha trigger GHA
+ dry dry run build
os nixos-rebuild subcmd
- output nixos config attr
- update update and run nixos-rebuild
+ output nixos config attr
+ update update and run nixos-rebuild
flags:
--flake path/to/flake
@@ -83,5 +82,3 @@ Oizys was birthed by the goddess Nyx/Nix and embodies suffering and misery. Whic
> [!NOTE]
> I don't use home-manager to manager my shell/user configs. You can find those in my separate `chezmoi`-managed [`dotfiles`](https://git.dayl.in/daylin/dotfiles) repository.
-
-
diff --git a/hosts/algiz/README.md b/hosts/algiz/README.md
index 20233bc..7527984 100644
--- a/hosts/algiz/README.md
+++ b/hosts/algiz/README.md
@@ -30,9 +30,11 @@ ln -s /run/current-system/sw/bin/gitea /usr/local/bin/gitea
## Setting up Attic
Generated a key using command provided in attic docs:
+
```sh
nix run nixpkgs#openssl -- genrsa -traditional 4096 | base64 -w0
```
+
And wrote `ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="output from above"` to `/etc/attic.env`
I generated a token to configure the caches using the following command:
@@ -43,4 +45,3 @@ atticd-atticadm make-token --sub daylin --push "*" --pull "*" --validity '1y' --
If I handled secrets via `sops` or `agenix` I think this could be stored directly in the repo.
I also had to modify the firewall so that docker would forward along the requests by caddy to `host.docker.internal` correctly.
-
diff --git a/hosts/mannaz/README.md b/hosts/mannaz/README.md
index 3e59679..9b352f3 100644
--- a/hosts/mannaz/README.md
+++ b/hosts/mannaz/README.md
@@ -2,4 +2,3 @@
mannaz
-
diff --git a/hosts/othalan/README.md b/hosts/othalan/README.md
index 15a10bc..e5cb4b3 100644
--- a/hosts/othalan/README.md
+++ b/hosts/othalan/README.md
@@ -2,4 +2,3 @@
othalan
-
diff --git a/overlays/default.nix b/overlays/default.nix
index 661146c..4584c73 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,6 +2,7 @@
(loadOverlays inputs ./.)
++ [
inputs.nim2nix.overlays.default # adds buildNimPackage
+
(final: prev: {
stable = import inputs.stable {
system = final.system;
diff --git a/todo.md b/todo.md
index 8606896..ae32432 100644
--- a/todo.md
+++ b/todo.md
@@ -27,4 +27,3 @@ Is this related to above and could maybe resolved by settling on a stable versio
> kernel: ucsi_acpi USBC000:00: error -EINVAL: PPM init failed
-