flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=300228b503b36e5977b0d58713c5b4cf1f07b8a9&submodules=1' (2024-07-17)
• Updated input 'lix':
    '8d12e0fbb7.tar.gz?narHash=sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es%3D' (2024-07-24)
  → 'c4c7cb7613.tar.gz?narHash=sha256-bzqEYvkT78V86XPp4/WRYiLBeYZ0bqZu%2B2Who9UuIgE%3D' (2024-07-25)

.github/workflows/update.yml

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

flake.lock

@@ -499,11 +499,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721841700,
+        "lastModified": 1721930741,
-        "narHash": "sha256-5aO0cXENUI/38xsG0ww0QSsVSlkvMvKfxbeYXYH08Es=",
+        "narHash": "sha256-bzqEYvkT78V86XPp4/WRYiLBeYZ0bqZu+2Who9UuIgE=",
-        "rev": "8d12e0fbb7306cbc58b12ef051d7067d703738de",
+        "rev": "c4c7cb7613a859faee3933a7f24f3e496e5548e9",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8d12e0fbb7306cbc58b12ef051d7067d703738de.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c4c7cb7613a859faee3933a7f24f3e496e5548e9.tar.gz"
       },
       "original": {
         "type": "tarball",

hosts/algiz/default.nix

@@ -1,12 +1,5 @@
+{ enabled, ... }:
 {
-  self,
-  pkgs,
-  enabled,
-  ...
-}:
-{
-  imports = with self.nixosModules; [ restic ];
-
   oizys = {
     languages = [
       "nim"
@@ -20,12 +13,6 @@
     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

@@ -0,0 +1,8 @@
+{ 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,8 +1,4 @@
-{
+{ config, enabled, ... }:
-  config,
-  enabled,
-  ...
-}:
 {
   # Use the systemd-boot EFI boot loader.
   boot.loader = {

lib/generators.nix

@@ -8,7 +8,6 @@ let
   inherit (builtins) filter;
   inherit (lib)
     nixosSystem
-    isNixFile
     mkDefaultOizysModule
     mkOizysModule
     enabled
@@ -16,12 +15,17 @@ 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 = [
@@ -54,7 +58,8 @@ let
         ../overlays
         inputs.lix-module.nixosModules.default
         inputs.hyprland.nixosModules.default
-      ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
+      ] ++ (hostFiles hostName);
+
       specialArgs = {
         inherit
           inputs