summaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
Diffstat (limited to 'systems')
-rw-r--r--systems/darwin.nix14
-rw-r--r--systems/nixos.nix24
2 files changed, 16 insertions, 22 deletions
diff --git a/systems/darwin.nix b/systems/darwin.nix
index ec67d09..120e088 100644
--- a/systems/darwin.nix
+++ b/systems/darwin.nix
@@ -1,13 +1,7 @@
-{ self, ... }:
{
- flake = {
- darwinConfigurations =
- let
- # see ./lib/builders.nix
- inherit (self.lib) darwinSystem;
- in
- {
- caroline = darwinSystem { modules = [ ./caroline ]; };
- };
+ darwinConfigurations = {
+ caroline = {
+ modules = [ ./caroline ];
+ };
};
}
diff --git a/systems/nixos.nix b/systems/nixos.nix
index b2a973e..f610ea4 100644
--- a/systems/nixos.nix
+++ b/systems/nixos.nix
@@ -1,17 +1,17 @@
-{ self, ... }:
+{ inputs, ... }:
{
- flake = {
- nixosConfigurations =
- let
- # see ./lib/builders.nix
- inherit (self.lib) nixosSystem nixosSystemStable;
- in
- {
- glados = nixosSystem { modules = [ ./glados ]; };
+ nixosConfigurations = {
+ glados = {
+ modules = [ ./glados ];
+ };
- glados-wsl = nixosSystem { modules = [ ./glados-wsl ]; };
+ glados-wsl = {
+ modules = [ ./glados-wsl ];
+ };
- atlas = nixosSystemStable { modules = [ ./atlas ]; };
- };
+ atlas = {
+ nixpkgs = inputs.nixpkgs-stable;
+ modules = [ ./atlas ];
+ };
};
}