From 4aae985f0a4ced2ecbd21dfdfba058e960e181d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Sat, 12 Aug 2023 08:30:29 +0100
Subject: [PATCH] swap to custom base image for flakes action

---
 .gitea/workflows/build.yaml               | 11 ++++-------
 nixos/boxes/bolty/gitea-runner-token.sops |  6 +++---
 nixos/boxes/bolty/gitea-runner.nix        |  7 ++-----
 nixos/home-manager/cli.nix                |  1 +
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 72cf30f9..899e0ab1 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -5,19 +5,16 @@ env:
     DEV_SHELL_NAME: CI
 jobs:
   build:
-    runs-on: linux_amd64
+    runs-on: flakes-action
     steps:
-      - name: Hello
-        run: |
-          echo "Hello and welcome"
       - uses: actions/checkout@v3
         name: Checkout
       - name: Metadata
         run: |
-          nix --no-eval-cache --extra-experimental-features 'nix-command flakes' flake metadata
+          nix flake metadata
       - name: Statix
         run: |
-          nix --no-eval-cache --no-sandbox --extra-experimental-features 'nix-command flakes' develop -c statix check
+          nix develop -c statix check
       - name: Flake check
         run: |
-          nix --no-eval-cache --extra-experimental-features 'nix-command flakes' flake check
\ No newline at end of file
+          nix flake check
\ No newline at end of file
diff --git a/nixos/boxes/bolty/gitea-runner-token.sops b/nixos/boxes/bolty/gitea-runner-token.sops
index e98c6d32..d896b04b 100644
--- a/nixos/boxes/bolty/gitea-runner-token.sops
+++ b/nixos/boxes/bolty/gitea-runner-token.sops
@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:83nNd8Kfwlh8aufoQaDDjOuslyLW1ePv5hrTpeuEjv5gmzo4it2YsRfb0/BXwlav,iv:TPsuo2gS9ZU/ftYOcOiWk4EybkIOAq6DT+c72UFW0wY=,tag:9d7gLY1QrJ9bZQN7CtRW3Q==,type:str]",
+	"data": "ENC[AES256_GCM,data:v2Wwja9LVmHL0nrRKaD+qSpS97VHOVyUSkaC7zDLJ3MkrZYDLRIPZ3NaxFlaWfSz,iv:z5tlmwGAMh+Xaf9jVR2CrWMHv5+MBBG8cP8qvy6sG70=,tag:Vxfi2f/ed/XH7Joc2P5oxA==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
@@ -47,8 +47,8 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRTXVwRzVSd2NSSi90SVVu\na05jeitPNnE5TVJ1NXk5WGd6UnhObUwveHg0CjU0dTNxUUdtb253ZHdTMFkycWdI\nbjZsanUwSGdHcFZkckIrRDRTWldha3cKLS0tIE8wM09WMnhNeklnYytUWkVTc01E\neldXYlJXRm1OMWo0T1U3UlY4SFBndVEKs56uk3j02g1g7Ae16UGfwRQJghPvS8iG\nDcIrJp6tb5ToYKeAGcTDpDvaQeNWKBX6fSLVIiJbgDWIbbZp1HRYpw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2023-07-23T08:55:53Z",
-		"mac": "ENC[AES256_GCM,data:wAI7TVTbMzpiJrncGFeQDY/Qv4GnpXhuTjUwLi86f4KvTGVlNIX5hipDmZfCk+wAfanP14bYB2vdZ3jeJoko8nSfFQmrJ2LVMudg3uym4eOxYSRraRjcvLGrprzLUoFY0Tf+/60tRTjvFufq/AXbo7W12lHAgyE/Lk1DgQlnYi8=,iv:RWnui/ghVmB/tLPMkvHOyBGoWeCgg8ELn7PtMEFe5zQ=,tag:DqoJQ1JleP7tZbhRlzEQ0g==,type:str]",
+		"lastmodified": "2023-08-12T07:27:46Z",
+		"mac": "ENC[AES256_GCM,data:z2hkjo1ABKc9xPrX+vPbxyNEdXBc2MlyihxhfdBq75R6y8GF8EjwG70ExtsqANBH6PKmj49nef9YzDrEJ19YAFbSXV+GTwOfgyBTAcgPwmc7mS2+xN6Ilx41XKjHCMqeb5oCJK4pFLTXP3HLWaLWVduITJ5xjSDhev9Tl+oakH0=,iv:LE2lKzgXboPGHZ5Z+OXhab+wfFolVvEe5Siowmssn0k=,tag:3pTBd/6HajuH1yCilM0eUw==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.7.3"
diff --git a/nixos/boxes/bolty/gitea-runner.nix b/nixos/boxes/bolty/gitea-runner.nix
index ef1f4c3c..e64ae2c9 100644
--- a/nixos/boxes/bolty/gitea-runner.nix
+++ b/nixos/boxes/bolty/gitea-runner.nix
@@ -36,11 +36,8 @@ in
         nix
       ];
       labels = [
-        "nixery-nix-node:docker://nixery.dev/shell/nix/git/nodejs:latest"
-        "nix-flakes:docker://nixpkgs/nix-flakes:latest"
-        "node16:docker://node:16-bullseye" # compat with github actions
-        "node-latest:docker://node:lts-bookworm" # compat with github actions
-        "ubuntu-kinetic:docker://ubuntu:kinetic" # compat with github actions
+        "flakes-action:docker://git.cyplo.dev/cyplo/base-images/flakes-action:latest"
+        "ubuntu-kinetic:docker://ubuntu:kinetic"
         "linux_amd64:host" # compat with github actions
       ];
     };
diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix
index cbbdb6f0..f6941457 100644
--- a/nixos/home-manager/cli.nix
+++ b/nixos/home-manager/cli.nix
@@ -18,6 +18,7 @@
     curl
     dnsutils
     docker-compose
+    dive
     du-dust
     esptool
     exercism