From bd132825d4ae0f7ea0d8ad69e52bf2ddebd6aa3b Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 3 Jun 2022 19:43:51 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20update=20and=20add=20darwin-loca?= =?UTF-8?q?l=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 18 +++++++++--------- flake.nix | 10 ++++++++-- hosts/heraclitus/homebrew.nix | 1 + modules/home-assistant/default.nix | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 52722cf..b2c3373 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1653943687, - "narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=", + "lastModified": 1654113406, + "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837", + "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654007547, - "narHash": "sha256-G812EeXZeGeGjkAvbTleGwcKFCGxdLOQb9aViOWASPc=", + "lastModified": 1654126564, + "narHash": "sha256-sgDXDKGmUG4h7OPDOHyQggFQ08ZqVzUIPi8351yhugY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5643714dea562f0161529ab23058562afeff46d0", + "rev": "f1c9c23aad972787f00f175651e4cb0d7c7fd5ea", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1654019511, + "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4653a19..544832c 100644 --- a/flake.nix +++ b/flake.nix @@ -66,12 +66,18 @@ in flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; + let + pkgs = nixpkgs.legacyPackages.${system}; + darwin-local = pkgs.writeScriptBin "darwin-local" '' + #!${pkgs.stdenv.shell} + nix build .#darwinConfigurations.$(hostname -s).system + ./result/sw/bin/darwin-rebuild switch --flake . + ''; in { devShells.default = pkgs.mkShell { name = "athens"; - buildInputs = [ deploy-rs.packages.${system}.deploy-rs pkgs.nixpkgs-fmt pkgs.sops ]; + buildInputs = [ darwin-local deploy-rs.packages.${system}.deploy-rs pkgs.nixpkgs-fmt pkgs.sops ]; }; }) // { nixosConfigurations = { diff --git a/hosts/heraclitus/homebrew.nix b/hosts/heraclitus/homebrew.nix index b50922c..b7f3956 100644 --- a/hosts/heraclitus/homebrew.nix +++ b/hosts/heraclitus/homebrew.nix @@ -38,6 +38,7 @@ "google-chrome" "gpg-suite" "hazel" + "home-assistant" "ipfs" "iterm2" "keybase" diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix index 24e0501..8f0cdd3 100644 --- a/modules/home-assistant/default.nix +++ b/modules/home-assistant/default.nix @@ -5,7 +5,7 @@ virtualisation.oci-containers = { containers = { home-assistant = { - image = "ghcr.io/home-assistant/home-assistant:2022.5.4"; + image = "ghcr.io/home-assistant/home-assistant:2022.5.5"; volumes = [ "/var/lib/hass:/config" "/etc/localtime:/etc/localtime:ro" ]; extraOptions = [ "--privileged" "--network=host" ];