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

@@ -307,6 +307,7 @@
       "locked": {
         "lastModified": 1721248202,
         "narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=",
+        "ref": "refs/heads/main",
         "rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9",
         "revCount": 4930,
         "submodules": true,
@@ -498,11 +499,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1721756973,
+        "lastModified": 1721930741,
-        "narHash": "sha256-M7Zb3UfjQ0o3qXHolhykIk+QzfhEBcEYK9QAPSiBtW4=",
+        "narHash": "sha256-bzqEYvkT78V86XPp4/WRYiLBeYZ0bqZu+2Who9UuIgE=",
-        "rev": "53f3e39815c3357c6465963359e94a6318b54af7",
+        "rev": "c4c7cb7613a859faee3933a7f24f3e496e5548e9",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/53f3e39815c3357c6465963359e94a6318b54af7.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c4c7cb7613a859faee3933a7f24f3e496e5548e9.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -679,11 +680,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1721691437,
+        "lastModified": 1721918221,
-        "narHash": "sha256-z3h4XqAdE1sqCdZxI9+gxLDEEbgGOVHIWZRMIjQheDo=",
+        "narHash": "sha256-y5whWNY6QegCurAwLAGkpRYL+9vjrQquVXC4Jfel1bU=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "79e1f9e956c60af6520c5f9d9e451e555a82da6f",
+        "rev": "0d5730fd37f70c4e56f37ba6e81bfe0a89e9da26",
         "type": "github"
       },
       "original": {
@@ -774,11 +775,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1721562059,
+        "lastModified": 1721743106,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
+        "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+        "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
         "type": "github"
       },
       "original": {
@@ -1160,6 +1161,7 @@
       "original": {
         "owner": "Cloudef",
         "repo": "zig2nix",
+        "rev": "9ec43c3e2cfd195bc7cbe3924037788e72a958e3",
         "type": "github"
       }
     },
@@ -1184,6 +1186,7 @@
       "original": {
         "owner": "zigtools",
         "repo": "zls",
+        "rev": "adf3b839b19df88c09877526007d8347ec982abb",
         "type": "github"
       }
     }

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