diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-10-31 22:23:58 -0600 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-10-31 22:23:58 -0600 |
| commit | 4b53fe5ff170c0f8670bf3d542ece665eec60893 (patch) | |
| tree | 750d37ded84013fab56c0cc5a5eef235b9413ac7 /flake.nix | |
| parent | d94ed7d8188d1390ba8986a3411479a36b9b5691 (diff) | |
| parent | aab187548391515abd7383ba75a44bd951b6d31f (diff) | |
Resolved merge conflict.
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -234,7 +234,16 @@ ]; # specialArgs = { inherit inputs; }; }; + bosco = nixpkgs.lib.nixosSystem { + modules = [ + ./machines/bosco/configuration.nix + ./machines/bosco/hardware-configuration.nix + ./modules/nixos/nix-common.nix + ./modules/nixos/environment.nix + ./modules/nixos/system-packages.nix + ]; + }; khad = nixpkgs.lib.nixosSystem { modules = [ ./machines/khad/configuration.nix |