From f49de28e92c06952bf17a995b2d749dad8b3caa8 Mon Sep 17 00:00:00 2001
From: Anna Kudriavtsev <anna328p@gmail.com>
Date: Sat, 31 Aug 2024 14:13:55 -0500
Subject: [PATCH] improve CI

---
 .github/workflows/build-systems.yml | 23 +++++++++++++++++------
 flake.nix                           | 19 ++++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-systems.yml b/.github/workflows/build-systems.yml
index ba0ceb8..c6c3088 100644
--- a/.github/workflows/build-systems.yml
+++ b/.github/workflows/build-systems.yml
@@ -6,15 +6,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
 
-      - uses: cachix/install-nix-action@v27
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      - uses: cachix/cachix-action@v15
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+
+      - name: Setup Cachix
+        uses: cachix/cachix-action@v15
         with:
           name: anna328p
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
-      - run: nix flake update keydb
-      - run: nix build 'path:.#nixosConfigurations.hermes.config.system.build.toplevel'
-      - run: echo 'OK'
\ No newline at end of file
+      - name: Update volatile inputs
+        run: nix flake update keydb
+
+      - name: Build hermes configuration
+        run: nix build --accept-flake-config 'path:.#nixosConfigurations.hermes.config.system.build.toplevel'
+
+      - name: Confirm success
+        run: echo 'OK'
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 99139ed..f697bc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,9 +26,11 @@
 
         # android
 
-        nix-on-droid.url = github:nix-community/nix-on-droid;
-        nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
-        nix-on-droid.inputs.home-manager.follows = "home-manager";
+        nix-on-droid = {
+            url = github:nix-community/nix-on-droid;
+            inputs.nixpkgs.follows = "nixpkgs";
+            inputs.home-manager.follows = "home-manager";
+        };
 
         # modules
 
@@ -92,6 +94,17 @@
 
     nixConfig = {
         allow-import-from-derivation = "true";
+
+        extra-substituters = ""
+            + " https://nix-community.cachix.org"
+            + " https://anna328p.cachix.org";
+
+        extra-trusted-public-keys = ""
+            + "nix-community.cachix.org-1"
+            + ":mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= "
+
+            + "anna328p.cachix.org-1"
+            + ":HcPUMrtQ7qT+bfx2fQ2HyJV5wCYQ2A3WwhxxrxDkvG0= ";
     };
 
     outputs = { self