move nix-darwin config out of backup

BrianHicks · Sep 7, 2021 · e5f707b · e5f707b
1 parent 9564827
commit e5f707b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/darwin-todo/darwin/darwin.sh b/darwin-todo/darwin/darwin.sh
diff --git a/flake.nix b/flake.nix
@@ -208,6 +208,8 @@
             nix.package = pkgs.nixUnstable;
             nixpkgs.overlays = mkOverlays "x86_64-darwin";
           })
+          ./machines/flame
+          inputs.home-manager.darwinModules.home-manager
         ];
       };
     };

diff --git a/darwin-todo/darwin/default.nix → machines/flame/default.nix b/darwin-todo/darwin/default.nix → machines/flame/default.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../home-manager/nix-darwin ./defaults.nix ];
-
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = [
@@ -46,7 +44,7 @@
   # dotfiles
   home-manager = {
     useUserPackages = true;
-    users.brianhicks = (import ../dotfiles);
+    users.brianhicks = import ../../dotfiles;
   };
 
   # darwin-rebuild told me to add this, so here we are

diff --git a/darwin-todo/darwin/defaults.nix → machines/flame/defaults.nix b/darwin-todo/darwin/defaults.nix → machines/flame/defaults.nix