summaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
authorseth <[email protected]>2024-05-24 04:46:59 -0400
committerseth <[email protected]>2024-05-24 21:36:05 -0600
commitef2b5ea9f2f9450eac7ac2a875a8f1c6599c1ed0 (patch)
tree5d21686d2d34986c6fcdf23fcd8f3a3c176d53bd /systems
parent5533072babca9fdefe45151ee834cdd14e1c679e (diff)
don't use flake module
Diffstat (limited to 'systems')
-rw-r--r--systems/atlas/default.nix2
-rw-r--r--systems/caroline/default.nix1
-rw-r--r--systems/default.nix20
-rw-r--r--systems/glados-wsl/default.nix2
4 files changed, 15 insertions, 10 deletions
diff --git a/systems/atlas/default.nix b/systems/atlas/default.nix
index 7145297..c0e8272 100644
--- a/systems/atlas/default.nix
+++ b/systems/atlas/default.nix
@@ -32,5 +32,7 @@
hostName = "atlas";
};
+ nixpkgs.hostPlatform = "aarch64-linux";
+
system.stateVersion = "23.05";
}
diff --git a/systems/caroline/default.nix b/systems/caroline/default.nix
index 932e85c..9a6efae 100644
--- a/systems/caroline/default.nix
+++ b/systems/caroline/default.nix
@@ -14,6 +14,7 @@
};
nix.settings.trusted-users = ["seth"];
+ nixpkgs.hostPlatform = "x86_64-darwin";
services.tailscale.enable = true;
diff --git a/systems/default.nix b/systems/default.nix
index 33736e6..881310b 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -3,28 +3,28 @@
self,
...
}: {
- configurations = {
- darwin = {
- caroline = {
+ flake = {
+ darwinConfigurations = let
+ inherit (self.lib) darwinSystem;
+ in {
+ caroline = darwinSystem {
modules = [./caroline];
};
};
- nixos = let
- stable = inputs.nixpkgs-stable.lib.nixosSystem;
+ nixosConfigurations = let
+ inherit (self.lib) nixosSystem nixosSystemStable;
in {
- glados = {
+ glados = nixosSystem {
modules = [./glados];
};
- glados-wsl = {
+ glados-wsl = nixosSystem {
modules = [./glados-wsl];
};
- atlas = {
- builder = stable;
+ atlas = nixosSystemStable {
modules = [./atlas];
- system = "aarch64-linux";
};
};
};
diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix
index 88b5184..cd53a82 100644
--- a/systems/glados-wsl/default.nix
+++ b/systems/glados-wsl/default.nix
@@ -32,6 +32,8 @@
networking.hostName = "glados-wsl";
+ nixpkgs.hostPlatform = "x86_64-linux";
+
system.stateVersion = "23.11";
traits.tailscale.enable = true;