From ef2b5ea9f2f9450eac7ac2a875a8f1c6599c1ed0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 24 May 2024 04:46:59 -0400
Subject: don't use flake module

---
 systems/atlas/default.nix      |  2 ++
 systems/caroline/default.nix   |  1 +
 systems/default.nix            | 20 ++++++++++----------
 systems/glados-wsl/default.nix |  2 ++
 4 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'systems')

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;
-- 
cgit v1.2.3