diff --git a/Makefile b/Makefile index 3cbd10a1..77ef4945 100644 --- a/Makefile +++ b/Makefile @@ -47,19 +47,19 @@ gc: ############################################################################ darwin-set-proxy: - echo "skip setting proxy, use global proxy instead" - # sudo python3 scripts/darwin_set_proxy.py + sudo python3 scripts/darwin_set_proxy.py + sleep 1 ha: darwin-set-proxy nix build .#darwinConfigurations.harmonica.system ./result/sw/bin/darwin-rebuild switch --flake . - sleep 3 + sleep 1 sudo chmod 644 /etc/agenix/alias-for-work.* ha-debug: darwin-set-proxy nix build .#darwinConfigurations.harmonica.system --show-trace --verbose ./result/sw/bin/darwin-rebuild switch --flake .#harmonica --show-trace --verbose - sleep 3 + sleep 1 sudo chmod 644 /etc/agenix/alias-for-work.* ############################################################################ diff --git a/home/base/desktop/development.nix b/home/base/desktop/development.nix index 952ee91b..5a96c1ea 100644 --- a/home/base/desktop/development.nix +++ b/home/base/desktop/development.nix @@ -41,6 +41,9 @@ # embedded development minicom + # ai related + python311Packages.huggingface-hub # huggingface-cli + # misc pkgs-unstable.devbox glow # markdown previewer diff --git a/modules/common.nix b/modules/common.nix index efccabcd..f8ba2580 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,4 +1,5 @@ { + pkgs, lib, username, ... @@ -29,11 +30,23 @@ }; # do garbage collection weekly to keep disk usage low - nix.gc = { - automatic = lib.mkDefault true; - dates = lib.mkDefault "weekly"; - options = lib.mkDefault "--delete-older-than 7d"; - }; + nix.gc = + { + automatic = lib.mkDefault true; + options = lib.mkDefault "--delete-older-than 7d"; + } + // ( + if pkgs.stdenv.isLinux + then { + dates = lib.mkDefault "weekly"; + } + else { + # nix-darwin + interval = { + Hour = 24; + }; + } + ); # Allow unfree packages nixpkgs.config.allowUnfree = lib.mkDefault false;