refactor: per host config

README.md

@@ -6,7 +6,7 @@ CI for Nammayatri
 In the nix shell, run:
 
 ```
-just deploy
+just deploy ny-ci-nixos
 ```
 
 >[!NOTE]
@@ -15,5 +15,5 @@ just deploy
 ## Progress
 
 - [ ] NixOS CI: Running GitHub runners
-- [ ] Refactor to prepare for multiple hosts
+- [x] Refactor to prepare for multiple hosts
 - [ ] macOS CI: nix-darwin

flake.nix

@@ -2,51 +2,36 @@
   inputs = {
     # Principle inputs (updated by `nix run .#update`)
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
     flake-parts.url = "github:hercules-ci/flake-parts";
-    nixos-flake.url = "github:srid/nixos-flake";
   };
 
   outputs = inputs@{ self, ... }:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" "aarch64-darwin" ];
-      imports = [ inputs.nixos-flake.flakeModule ];
 
-      flake =
+      flake.om.ci.default =
         let
-          myUserName = "admin";
+          hostsConfig =
+            let
+              inherit (inputs.nixpkgs.lib) listToAttrs nameValuePair attrNames;
+              inherit (builtins) map readDir;
+              #overrideInputs = {
+              #  common = ./common;
+              #};
+              hosts = attrNames (readDir ./hosts);
+              systems = {
+                ny-ci-nixos = [ "x86_64-linux" ];
+              };
+              configForHost = name: {
+                # inherit overrideInputs;
+                systems = systems.${name};
+                dir = "./hosts/${name}";
+              };
+            in
+            listToAttrs (map (name: nameValuePair name (configForHost name)) hosts);
         in
-        {
-          # Configurations for Linux (NixOS) machines
-          nixosConfigurations.ny-ci-nixos = self.nixos-flake.lib.mkLinuxSystem {
-            nixpkgs.hostPlatform = "x86_64-linux";
-            nixos-flake.sshTarget = "admin@ny-ci-nixos";
-            imports = [
-              ./nixos/hardware-configuration.nix
-              ./nixos/configuration.nix
-              {
-                system.stateVersion = "24.05";
-              }
-              # Setup home-manager in NixOS config
-              self.nixosModules.home-manager
-              {
-                home-manager.users.${myUserName} = {
-                  imports = [ self.homeModules.default ];
-                  home.stateVersion = "24.05";
-                };
-              }
-            ];
-          };
-
-          # home-manager configuration goes here.
-          homeModules.default = { pkgs, ... }: {
-            imports = [ ];
-            programs.git.enable = true;
-            programs.starship.enable = true;
-            programs.bash.enable = true;
-          };
+        hostsConfig // {
+          root.dir = ".";
         };
 
       perSystem = { pkgs, ... }: {

hosts/ny-ci-nixos/flake.nix

@@ -0,0 +1,48 @@
+{
+  inputs = {
+    # Principle inputs (updated by `nix run .#update`)
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    nixos-flake.url = "github:srid/nixos-flake";
+  };
+
+  outputs = inputs@{ self, ... }:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [ "x86_64-linux" "aarch64-darwin" ];
+      imports = [ inputs.nixos-flake.flakeModule ];
+
+      flake = {
+        # Configurations for Linux (NixOS) machines
+        nixosConfigurations.ny-ci-nixos = self.nixos-flake.lib.mkLinuxSystem {
+          nixpkgs.hostPlatform = "x86_64-linux";
+          nixos-flake.sshTarget = "admin@ny-ci-nixos";
+          imports = [
+            ./nixos/hardware-configuration.nix
+            ./nixos/configuration.nix
+            {
+              system.stateVersion = "24.05";
+            }
+            # Setup home-manager in NixOS config
+            self.nixosModules.home-manager
+            {
+              home-manager.users.admin = {
+                imports = [ self.homeModules.default ];
+                home.stateVersion = "24.05";
+              };
+            }
+          ];
+        };
+
+        # home-manager configuration goes here.
+        homeModules.default = { pkgs, ... }: {
+          imports = [ ];
+          programs.git.enable = true;
+          programs.starship.enable = true;
+          programs.bash.enable = true;
+        };
+      };
+    };
+}

justfile

@@ -1,6 +1,14 @@
+default:
+    @just --list
 
-deploy:
-  nix run .#activate ny-ci-nixos
+# List hosts
+hosts:
+    ls ./hosts
 
+# Auto-format source tree
 fmt:
   nix fmt
+
+# Deploy the given host (e.g.: `just deploy sambar`)
+deploy HOST:
+    nix run --override-input common ./common ./hosts/{{HOST}}#activate {{HOST}}