diff --git a/darwin-todo/darwin/darwin.sh b/darwin-todo/darwin/darwin.sh deleted file mode 100755 index fce2666..0000000 --- a/darwin-todo/darwin/darwin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p moreutils -HERE="$(realpath "$(dirname "$0")")" -darwin-rebuild "$@" -I "darwin-config=$HERE/default.nix" diff --git a/flake.nix b/flake.nix index e23f5a7..5890229 100644 --- 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 b/machines/flame/default.nix similarity index 93% rename from darwin-todo/darwin/default.nix rename to machines/flame/default.nix index 71da754..2234c82 100644 --- a/darwin-todo/darwin/default.nix +++ b/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 b/machines/flame/defaults.nix similarity index 100% rename from darwin-todo/darwin/defaults.nix rename to machines/flame/defaults.nix