.github/workflows/update.yml

@@ -14,11 +14,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - uses: daylin-bot/actions/setup@main
-
       - run: git checkout -B flake-lock
 
+      - name: Setup Git Bot
+        run: |
+          git --version
+          git config user.name 'daylin-bot'
+          git config user.email 'bot@dayl.in'
+
       - uses: DeterminateSystems/nix-installer-action@v12
         with:
           extra-conf: |
@@ -48,9 +51,7 @@ jobs:
               --print-build-logs
 
       - name: Commit Updates
-        uses: daylin-bot/actions/commit-and-push@main
+        run: git push --set-upstream --force origin flake-lock
-        with:
-          push-args: --set-upstream --force origin flake-lock
 
   build-full:
     needs: build-minimal

hosts/algiz/default.nix

@@ -1,5 +1,12 @@
-{ enabled, ... }:
 {
+  self,
+  pkgs,
+  enabled,
+  ...
+}:
+{
+  imports = with self.nixosModules; [ restic ];
+
   oizys = {
     languages = [
       "nim"
@@ -13,6 +20,12 @@
     nix-ld = enabled;
   };
 
+  environment.systemPackages = with pkgs; [
+    (writeShellScriptBin "gitea" ''
+      ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
+    '')
+  ];
+
   services.restic.backups.gdrive = {
     # directories created by gitea and soft-serve aren't world readable
     user = "root";

hosts/algiz/pkgs.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    (writeShellScriptBin "gitea" ''
-      ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
-    '')
-  ];
-}

hosts/mannaz/system.nix

@@ -1,4 +1,8 @@
-{ config, enabled, ... }:
+{
+  config,
+  enabled,
+  ...
+}:
 {
   # Use the systemd-boot EFI boot loader.
   boot.loader = {

lib/generators.nix

@@ -8,6 +8,7 @@ let
   inherit (builtins) filter;
   inherit (lib)
     nixosSystem
+    isNixFile
     mkDefaultOizysModule
     mkOizysModule
     enabled
@@ -15,17 +16,12 @@ let
     pkgsFromSystem
     pkgFromSystem
     overlayFrom
-    isNixFile
     ;
   inherit (lib.filesystem) listFilesRecursive;
 
   pkgFrom = pkgFromSystem "x86_64-linux";
   pkgsFrom = pkgsFromSystem "x86_64-linux";
 
-  hostPath = host: ../. + "/hosts/${host}";
-  # all nix files not including pkgs.nix
-  hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
-
   mkIso = nixosSystem {
     system = "x86_64-linux";
     modules = [
@@ -58,8 +54,7 @@ let
         ../overlays
         inputs.lix-module.nixosModules.default
         inputs.hyprland.nixosModules.default
-      ] ++ (hostFiles hostName);
+      ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
-
       specialArgs = {
         inherit
           inputs