From 2379d84e29209f56abdca53ef24d3fd644ba5bd0 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Jan 2026 20:04:16 -0700 Subject: [PATCH 1/8] nix format job --- .gitea/workflows/format.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitea/workflows/format.yml diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml new file mode 100644 index 0000000..9a12b12 --- /dev/null +++ b/.gitea/workflows/format.yml @@ -0,0 +1,22 @@ +name: nix CI format +on: + push: + branches: [main] + pull_request: + types: [opened, reopened] + +jobs: + amd64: + runs-on: [ ubuntu-24.04, amd64-builder ] + steps: + - name: nix format + run: nix run nixpkgs#alejandra -- . + +# arm64: +# runs-on : [ ubuntu-24.04, arm64-builder ] +# steps: +# - name: System Info +# run: | +# cat /etc/os-release +# echo +# uname -m -- 2.51.2 From 59f996a54defa78128480156c739029054b47f65 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Jan 2026 20:13:26 -0700 Subject: [PATCH 2/8] now? --- .gitea/workflows/format.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml index 9a12b12..def2587 100644 --- a/.gitea/workflows/format.yml +++ b/.gitea/workflows/format.yml @@ -9,8 +9,24 @@ jobs: amd64: runs-on: [ ubuntu-24.04, amd64-builder ] steps: - - name: nix format - run: nix run nixpkgs#alejandra -- . + - name: System Info + run: uname -m + + - name: Setup + run: | + apt update -y + apt install -y curl gnupg + curl -fsSL https://deb.nodesource.com/setup_20.x | bash - + apt install -y nodejs + + - name: Checkout + uses: actions/checkout@v5 + + - name: Install Nix using Determinate Systems action + uses: https://github.com/DeterminateSystems/nix-installer-action@v14 + + - name: Alejandra Check + run: nix run nixpkgs#alejandra -- --check . # arm64: # runs-on : [ ubuntu-24.04, arm64-builder ] -- 2.51.2 From 394d52c078566520485c5548ed26362e1f30bbc8 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Jan 2026 20:17:25 -0700 Subject: [PATCH 3/8] maybe now --- .gitea/workflows/format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml index def2587..c566e27 100644 --- a/.gitea/workflows/format.yml +++ b/.gitea/workflows/format.yml @@ -3,7 +3,7 @@ on: push: branches: [main] pull_request: - types: [opened, reopened] + types: [opened, reopened, synchronize] jobs: amd64: -- 2.51.2 From 77efc5e21329681f315b25dd2d91770897bc55d8 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Jan 2026 20:49:27 -0700 Subject: [PATCH 4/8] remove backrest --- software/backrest/.gitkeep | 0 software/backrest/backrest.nix | 29 ----------------------------- software/backrest/package.nix | 31 ------------------------------- 3 files changed, 60 deletions(-) delete mode 100644 software/backrest/.gitkeep delete mode 100644 software/backrest/backrest.nix delete mode 100644 software/backrest/package.nix diff --git a/software/backrest/.gitkeep b/software/backrest/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/software/backrest/backrest.nix b/software/backrest/backrest.nix deleted file mode 100644 index 648b00d..0000000 --- a/software/backrest/backrest.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, config, lib, cfg, ... }: - -# Thanks to Aires! -# https://aires.fyi/blog/installing-a-custom-package-with-nix/ - -let - backrest = pkgs.callPackage ./package.nix { inherit pkgs lib; }; -in -rec { - environment.systemPackages = [ - backrest - ]; - - # Install systemd service - systemd.services."backrest" = { - enable = true; - wants = [ "network-online.target" ]; - after = [ "syslog.target" "network-online.target" ]; - description = "Start the Backrest backup service and web UI"; - serviceConfig = { - Type = "simple"; - ExecStart = ''${backrest/backrest''; - Restart = "on-failure"; - RestartSrc = 10; - KillMode = "process"; - Environment = "HOME=${config.users.users.aaronh.home}"; - }; - }; -} diff --git a/software/backrest/package.nix b/software/backrest/package.nix deleted file mode 100644 index e43c165..0000000 --- a/software/backrest/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - lib, -}: -# Thanks to Aires! -# https://aires.fyi/blog/installing-a-custom-package-with-nix/ -pkgs.stdenv.mkDerivation rec { - pname = "backrest"; - version = "v0.11.0"; - - src = builtins.fetchurl { - url = "https://github.com/garethgeorge/backrest/releases/download/v0.11.0/backrest_Linux_x86_64.tar.gz"; - sha256 = "fd6c05339b6855f0acad001c2243d871f4621def04cef9eb3b452110fe175d49"; - }; - - doCheck = false; - - dontUnpack = true; - - installPhase = '' - tar -xf backrest_Darwin_x86_64.tar.gz - install -D $src $out/backrest - chmod a+x $out/backrest - ''; - - meta = with lib; { - homepage = "https://github.com/garethgeorge/backrest"; - description = "Backrest is a web UI and orchestrator for restic backup."; - platforms = platforms.linux ++ platforms.darwin; - }; -} -- 2.51.2 From 5abaab4e21befe76f3093c695a322ab90543aa38 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sun, 11 Jan 2026 09:19:06 -0700 Subject: [PATCH 5/8] format hello-docker --- docker/hello-docker.nix | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docker/hello-docker.nix b/docker/hello-docker.nix index 2dfa696..ecd3679 100644 --- a/docker/hello-docker.nix +++ b/docker/hello-docker.nix @@ -1,25 +1,25 @@ let pkgs = import {}; in -pkgs.dockerTools.buildImage { - name = "hello"; - tag = "latest"; + pkgs.dockerTools.buildImage { + name = "hello"; + tag = "latest"; - copyToRoot = pkgs.buildEnv { - name = "image-root"; - paths = [ - pkgs.hello - pkgs.busybox - ]; - pathsToLink = [ "/bin" ]; - }; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + paths = [ + pkgs.hello + pkgs.busybox + ]; + pathsToLink = ["/bin"]; + }; - runAsRoot = '' - mkdir -p /data - ''; + runAsRoot = '' + mkdir -p /data + ''; - config = { - Cmd = [ "/bin/hello" ]; - WorkingDir = "/data"; - }; -} + config = { + Cmd = ["/bin/hello"]; + WorkingDir = "/data"; + }; + } -- 2.51.2 From c740b79528db31ca54c08dc457b700fae700c286 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 21 Jan 2026 07:17:29 -0700 Subject: [PATCH 6/8] use new runner --- .gitea/workflows/format.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml index c566e27..be3f2dd 100644 --- a/.gitea/workflows/format.yml +++ b/.gitea/workflows/format.yml @@ -1,4 +1,4 @@ -name: nix CI format +name: nix format check on: push: branches: [main] @@ -7,7 +7,7 @@ on: jobs: amd64: - runs-on: [ ubuntu-24.04, amd64-builder ] + runs-on: [ nix-flakes, amd64-builder ] steps: - name: System Info run: uname -m @@ -21,9 +21,6 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - - name: Install Nix using Determinate Systems action - uses: https://github.com/DeterminateSystems/nix-installer-action@v14 - name: Alejandra Check run: nix run nixpkgs#alejandra -- --check . -- 2.51.2 From 5bfd0ee4ea9c7afacb858a77054834a8d02cd823 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 21 Jan 2026 07:25:17 -0700 Subject: [PATCH 7/8] allow to fail for the format check --- .gitea/workflows/format.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml index be3f2dd..5e02736 100644 --- a/.gitea/workflows/format.yml +++ b/.gitea/workflows/format.yml @@ -24,6 +24,7 @@ jobs: - name: Alejandra Check run: nix run nixpkgs#alejandra -- --check . + continue-on-error: true # arm64: # runs-on : [ ubuntu-24.04, arm64-builder ] -- 2.51.2 From c3c87489b86694f692061777984fe67f8c66e145 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Wed, 21 Jan 2026 07:28:13 -0700 Subject: [PATCH 8/8] remove unused section --- .gitea/workflows/format.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitea/workflows/format.yml b/.gitea/workflows/format.yml index 5e02736..b0a9ec1 100644 --- a/.gitea/workflows/format.yml +++ b/.gitea/workflows/format.yml @@ -24,13 +24,4 @@ jobs: - name: Alejandra Check run: nix run nixpkgs#alejandra -- --check . - continue-on-error: true - -# arm64: -# runs-on : [ ubuntu-24.04, arm64-builder ] -# steps: -# - name: System Info -# run: | -# cat /etc/os-release -# echo -# uname -m + continue-on-error: true -- 2.51.2