From 20a668fc8ee30f1ecbe757476f7e73e30b8e45f7 Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 14:56:56 +0900
Subject: [PATCH 1/6] ci(cachix-pusher): Create

---
 .github/workflows/cachix-pusher.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/cachix-pusher.yml

diff --git a/.github/workflows/cachix-pusher.yml b/.github/workflows/cachix-pusher.yml
new file mode 100644
index 00000000..246220a8
--- /dev/null
+++ b/.github/workflows/cachix-pusher.yml
@@ -0,0 +1,18 @@
+name: "cachix-pusher"
+
+on:
+  branches:
+    - master
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v25
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: cachix/cachix-action@v14
+      with:
+        name: simula
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

From 5740a27809aa324462ac8422033eb225af7a0bb1 Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 15:00:38 +0900
Subject: [PATCH 2/6] fix(cachix-pusher): Fix CI

---
 .github/workflows/cachix-pusher.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cachix-pusher.yml b/.github/workflows/cachix-pusher.yml
index 246220a8..de88e2c2 100644
--- a/.github/workflows/cachix-pusher.yml
+++ b/.github/workflows/cachix-pusher.yml
@@ -1,8 +1,11 @@
 name: "cachix-pusher"
 
 on:
-  branches:
-    - master
+  push:
+    branches:
+      - master
+    tags:
+      - *
 
 jobs:
   push:

From 60153ec68d6b9ea624da5fe2a83074a921aa16cb Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 15:02:17 +0900
Subject: [PATCH 3/6] fix(cachix-pusher): Fix CI!! AGAIN!!

---
 .github/workflows/cachix-pusher.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cachix-pusher.yml b/.github/workflows/cachix-pusher.yml
index de88e2c2..633f317f 100644
--- a/.github/workflows/cachix-pusher.yml
+++ b/.github/workflows/cachix-pusher.yml
@@ -3,9 +3,9 @@ name: "cachix-pusher"
 on:
   push:
     branches:
-      - master
+      - "master"
     tags:
-      - *
+      - "*"
 
 jobs:
   push:

From b2adf66b33dc56eeafa8ef935d2efd63dc778b50 Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 15:06:01 +0900
Subject: [PATCH 4/6] fix(cachix-pusher): Fix CI one more again

---
 .github/workflows/cachix-pusher.yml | 4 ++--
 .github/workflows/nix-checker.yml   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cachix-pusher.yml b/.github/workflows/cachix-pusher.yml
index 633f317f..3a0d7797 100644
--- a/.github/workflows/cachix-pusher.yml
+++ b/.github/workflows/cachix-pusher.yml
@@ -3,9 +3,9 @@ name: "cachix-pusher"
 on:
   push:
     branches:
-      - "master"
+      - 'master'
     tags:
-      - "*"
+      - '*'
 
 jobs:
   push:
diff --git a/.github/workflows/nix-checker.yml b/.github/workflows/nix-checker.yml
index e39f811c..68bdd4db 100644
--- a/.github/workflows/nix-checker.yml
+++ b/.github/workflows/nix-checker.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
   push:
     tags:
+      - '*'
     branches:
       - 'main'
 

From 6788ea85f49a4487f36e6a1a1c665376e10ad88b Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 15:07:32 +0900
Subject: [PATCH 5/6] style(treefmt-nix): Append actionlint

---
 flake.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 6e8a330a..3050d1bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -349,7 +349,12 @@
 
           treefmt = {
             projectRootFile = "project.godot";
+
+            # Nix
             programs.nixfmt.enable = true;
+
+            # GitHub Actions
+            programs.actionlint.enable = true;
           };
 
           packages = {
@@ -386,4 +391,4 @@
           };
         };
     };
-}
\ No newline at end of file
+}

From 5914111489bff0366d08e3cc283e69c2f79bb36d Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Wed, 2 Jul 2025 15:27:17 +0900
Subject: [PATCH 6/6] style: nix fmt

---
 flake.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3050d1bf..58a2abf0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,8 @@
   description = "Flake for SimulaVR/Simula";
 
   nixConfig = {
-    extra-substituters = [
-      "https://simula.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "simula.cachix.org-1:Sr0SD5FIjc8cUVIeBHl8VJswQEJOBIE6u3wpmjslGBA="
-    ];
+    extra-substituters = [ "https://simula.cachix.org" ];
+    extra-trusted-public-keys = [ "simula.cachix.org-1:Sr0SD5FIjc8cUVIeBHl8VJswQEJOBIE6u3wpmjslGBA=" ];
   };
 
   inputs = {
@@ -324,7 +320,7 @@
               makeWrapper $out/bin/simula-unwrapped $out/bin/simula \
               --prefix PATH : ${lib.makeBinPath passthru.simulaRuntimePrograms} \
               --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath passthru.simulaRuntimeLibs}
-              
+
               cat > $out/bin/simula-monado-service << 'EOF'
                 ${simulaMonadoServiceContent}
               EOF
@@ -358,11 +354,7 @@
           };
 
           packages = {
-            inherit
-              simula
-              godot-haskell
-              godot-haskell-plugin
-              ;
+            inherit simula godot-haskell godot-haskell-plugin;
             default = simula;
           };