Moved hosts/common to modules. Updated CI effects.

README.md

@@ -3,16 +3,17 @@
   雪定<rp>(</rp><rt>せってい</rt><rp>)</rp>
 </ruby>
 </h1>
+Collection of my personal Nix configurations and opinionated NixOS, nix-darwin, home-manager, and flake-parts modules.
 
 ## Project structure
 - hosts - per-machine configurations
-  - common - common options between my machines which aren't reusable by others
   - kazuki - my linux arm server
   - legion - my linux x86 server[^1]
   - hijiri - my macbook[^1]
   - hijiri-vm - linux vm running on my macbook
   - miyagi - my work machine[^1]
 - modules - options which in principle should be reusable by others
+  - */common - common options between my machines which aren't meant to be reusable by others
   - nixos
     - settei - my opinionated nixos options
   - flake - flake-parts modules

effects.nix

@@ -1,9 +1,16 @@
 {
   defaultEffectSystem = "aarch64-linux";
+
   hercules-ci = {
     flake-update = {
       enable = true;
-      when.dayOfWeek = null;
+      when.dayOfWeek = "Mon";
+    };
+  };
+
+  herculesCI = {
+    onPush = {
+      default.enable = true;
     };
   };
 }

hosts/default.nix

@@ -45,7 +45,7 @@
           inputs.home-manager.nixosModules.home-manager
           inputs.hercules-ci-agent.nixosModules.agent-service
           self.nixosModules.settei
-          ./common
+          self.nixosModules.common
           defaultOptions
           module
         ];

modules/nixos/common/hercules.nix

@@ -4,6 +4,8 @@
   lib,
   ...
 }: {
+  _file = ./hercules.nix;
+
   options.common.hercules.enable = lib.mkEnableOption "Enables hercules-ci-agent with my configuration";
 
   config = lib.mkIf config.common.hercules.enable {

modules/nixos/default.nix

@@ -1,3 +1,6 @@
 {config, ...}: {
-  flake.nixosModules.settei = import ./settei {inherit (config) perInput;};
+  flake.nixosModules = {
+    settei = import ./settei {inherit (config) perInput;};
+    common = ./common;
+  };
 }