From 13ccf8c39daabb48ec5346385f9c956d8df97c9c Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Mon, 1 May 2023 16:01:11 -0400 Subject: [PATCH] fixup setup.sh --- nix/home-manager/flake.lock | 12 ++++++------ nix/setup.sh | 10 ++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index cb57feb..a9f0b9e 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1682535786, - "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", + "lastModified": 1682779989, + "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d82c9af8175878a461a0fdf914e67cc446664570", + "rev": "3144311f31194b537808ae6848f86f3dbf977d59", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1682453498, - "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", "type": "github" }, "original": { diff --git a/nix/setup.sh b/nix/setup.sh index 855a6d7..d845872 100755 --- a/nix/setup.sh +++ b/nix/setup.sh @@ -8,5 +8,11 @@ nix-channel --update nix-shell '' -A install -nix flake --update -home-manager switch --flake "$PWD/home-manager#acicchetti" +nix flake update +if [[ $(uname) == "Darwin" ]]; then + # we're modern macOS + home-manager switch --flake "$PWD/home-manager#aarch64-darwin-acicchetti" +else + # we're linux + home-manager switch --flake "$PWD/home-manager#x86_64-linux-acicchetti" +fi