hosts+users: use new lib to generate configs

3 files changed, 5 insertions, 14 deletions

diff --git a/hosts/caroline/default.nix b/hosts/caroline/default.nix
index 2112968..98c9f4f 100644
--- a/hosts/caroline/default.nix
+++ b/hosts/caroline/default.nix
@@ -1,12 +1,4 @@
-{pkgs, ...}: {
-  home-manager.users.seth = {
-    home.packages = with pkgs; [
-      discord
-      iterm2
-      spotify
-    ];
-  };
-
+_: {
   getchoo.desktop = {
     homebrew.enable = true;
     gpg.enable = true;
diff --git a/hosts/default.nix b/hosts/default.nix
index f1ff518..e5743e1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,23 +1,21 @@
 {
   inputs,
-  myLib,
   self,
   withSystem,
   ...
 }: {
   flake = let
-    inherit (myLib.configs inputs) mkSystems;
-
+    inherit (self.lib.configs) mapSystems;
     profiles = import ./profiles.nix {inherit self inputs;};
   in {
-    darwinConfigurations = mkSystems {
+    darwinConfigurations = mapSystems {
       caroline = {
         system = "x86_64-darwin";
         profile = profiles.personal-darwin;
       };
     };
 
-    nixosConfigurations = mkSystems {
+    nixosConfigurations = mapSystems {
       glados = {
         modules = with inputs; [
           nixos-hardware.nixosModules.common-cpu-amd-pstate
diff --git a/hosts/profiles.nix b/hosts/profiles.nix
index 390e793..ec8cb04 100644
--- a/hosts/profiles.nix
+++ b/hosts/profiles.nix
@@ -73,6 +73,7 @@ in {
       home-manager.darwinModules.home-manager
 
       ../users/seth
+      ../users/seth/darwin.nix
       self.darwinModules.getchoo
 
       {