summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix8
-rw-r--r--modules/darwin/default.nix3
2 files changed, 3 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 739c687..f9142a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,10 +44,6 @@
metadata = nixpkgs.lib.importTOML ./metadata.toml;
};
- darwinModules =
- builtins.attrValues (import ./modules/darwin).general
- ++ builtins.attrValues (import ./modules/darwin).personal;
-
# This is a function that generates an attribute by calling a function
# you pass to it, with each system as an argument. `systems` lists all
# supported systems.
@@ -72,7 +68,7 @@
./hosts/common.nix
./home
]
- ++ darwinModules;
+ ++ builtins.attrValues (import ./modules/darwin);
};
};
@@ -108,7 +104,7 @@
overlays = import ./overlays;
# We export the generally applicable modules.
- darwinModules = (import ./modules/darwin).geneal;
+ darwinModules = import ./modules/darwin;
homeModules = import ./modules/home-manager;
nixosModules = import ./modules/nixos;
};
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 48f0511..832940f 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,4 +1,3 @@
{
- general.still-awake = import ./still-awake;
- personal = {};
+ still-awake = import ./still-awake;
}