diff --git a/Makefile b/Makefile index f6edeee6..05a89091 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,9 @@ +############################################################################ +# +# Nix commands related to the local machine +# +############################################################################ + deploy: sudo nixos-rebuild switch --flake . @@ -17,6 +23,12 @@ gc: # garbage collect all unused nix store entries sudo nix store gc --debug +############################################################################ +# +# Darwin related commands, harmonica is my macbook pro's hostname +# +############################################################################ + darwin-set-proxy: sudo python3 scripts/darwin_set_proxy.py @@ -31,16 +43,28 @@ darwin-debug: darwin-set-proxy --extra-experimental-features 'nix-command flakes' ./result/sw/bin/darwin-rebuild switch --flake . --show-trace --verbose -idols: + +############################################################################ +# +# Idols, Commands related to my remote distributed building cluster +# +############################################################################ + + +add-idols-ssh-key: + ssh-add ~/.ssh/ai-idols + +idols: add-idols-ssh-key nixos-rebuild --flake .#aquamarine --target-host aquamarine --build-host aquamarine switch --use-remote-sudo nixos-rebuild --flake .#ruby --target-host ruby --build-host ruby switch --use-remote-sudo nixos-rebuild --flake .#kana --target-host kana --build-host kana switch --use-remote-sudo -idols-debug: +idols-debug: add-idols-ssh-key nixos-rebuild --flake .#aquamarine --target-host aquamarine --build-host aquamarine switch --use-remote-sudo --show-trace --verbose nixos-rebuild --flake .#ruby --target-host ruby --build-host ruby switch --use-remote-sudo --show-trace --verbose nixos-rebuild --flake .#kana --target-host kana --build-host kana switch --use-remote-sudo --show-trace --verbose +# only used once to setup the virtual machines idols-image: # take image for idols, and upload the image to proxmox nodes. nom build .#aquamarine @@ -52,6 +76,13 @@ idols-image: nom build .#kana scp result/vzdump-qemu-*.vma.zst root@um560:/var/lib/vz/dump + +############################################################################ +# +# Misc, other useful commands +# +############################################################################ + fmt: # format the nix files in this repo nix fmt diff --git a/flake.lock b/flake.lock index ae7e13d7..d4b20317 100644 --- a/flake.lock +++ b/flake.lock @@ -363,18 +363,18 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1686869522, + "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -434,16 +434,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1685836261, - "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=", + "lastModified": 1686921029, + "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd4982554e18b936790da07c4ea2db7c7600f283", + "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -490,7 +490,7 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-wayland": "nixpkgs-wayland" } },