flakeModules/configurations: refactor into freeform module, add aliases

1 files changed, 18 insertions, 20 deletions

diff --git a/systems/default.nix b/systems/default.nix
index 49f0e44..f708430 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -2,33 +2,31 @@
   inputs,
   self,
   ...
-}: {
-  configurations = {
-    nixos = {
-      builder = inputs.nixpkgs.lib.nixosSystem;
-
-      systems = {
-        glados = {};
-
-        glados-wsl = {};
+}: let
+  nixos-stable = inputs.nixpkgs-stable.lib.nixosSystem;
+in {
+  nixosConfigurations = {
+    glados = {
+      system = "x86_64-linux";
+    };
 
-        atlas = {
-          builder = inputs.nixpkgs-stable.lib.nixosSystem;
-          system = "aarch64-linux";
-        };
-      };
+    glados-wsl = {
+      system = "x86_64-linux";
     };
 
-    darwin = {
-      builder = inputs.darwin.lib.darwinSystem;
+    atlas = {
+      builder = nixos-stable;
+      system = "aarch64-linux";
+    };
+  };
 
-      systems = {
-        caroline = {};
-      };
+  darwinConfigurations = {
+    caroline = {
+      system = "x86_64-darwin";
     };
   };
 
-  flake.deploy = {
+  deploy = {
     remoteBuild = true;
     fastConnection = false;
     nodes = self.lib.deploy.mapNodes [