diff --git a/Makefile b/Makefile index acb7ba27..06d8b742 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,9 @@ ha: darwin-set-proxy ./result/sw/bin/darwin-rebuild switch --flake .#harmonica sleep 1 +ha-rollback: + ./result/sw/bin/darwin-rebuild rollback + ha-debug: darwin-set-proxy nom build .#darwinConfigurations.harmonica.system --show-trace --verbose ./result/sw/bin/darwin-rebuild switch --flake .#harmonica --show-trace --verbose diff --git a/modules/darwin/nix-core.nix b/modules/darwin/nix-core.nix index 1aa111de..044af5a8 100644 --- a/modules/darwin/nix-core.nix +++ b/modules/darwin/nix-core.nix @@ -11,16 +11,23 @@ # ################################################################################### + # Fix: https://github.com/LnL7/nix-darwin/issues/149#issuecomment-1741720259 + # nix is installed via DeterminateSystems's nix-installer. + environment.etc."zshrc".knownSha256Hashes = [ + "b9902f2020c636aeda956a74b5ae11882d53e206d1aa50b3abe591a8144fa710" + ]; + environment.etc."bashrc".knownSha256Hashes = [ + "204d2a960b3ab80e51748d3db0b63d940347ba71119ae6f14cccfec35da56cce" + ]; + environment.etc."zshenv".knownSha256Hashes = [ + "383a89c1f79c3bcfd2ff39a2b73b5103d0303161b3be9eac88fce83e0789f0b7" + ]; + # Allow unfree packages nixpkgs.config.allowUnfree = true; # Auto upgrade nix package and the daemon service. - # services.nix-daemon.enable = false; - # - # Use this instead of services.nix-daemon.enable if you - # don't wan't the daemon service to be managed for you. - nix.useDaemon = true; - + services.nix-daemon.enable = true; nix.package = pkgs.nix; # Disable auto-optimise-store because of this issue: