build(justfile): fix on darwin & linux, add gum

This commit is contained in:
winston 2023-08-25 23:16:58 +02:00
parent 42d193d715
commit 599e87fb78
Signed by: winston
GPG key ID: 3786770EDBC2B481
2 changed files with 6 additions and 9 deletions

View file

@ -13,17 +13,17 @@ export NIX_CONFIG := "
rebuild *args: rebuild *args:
#!/usr/bin/env -S bash -euo pipefail #!/usr/bin/env -S bash -euo pipefail
dir="${TMPDIR:-/tmp}/nix-darwin" dir="${TMPDIR:-/tmp}/nix-darwin"
! [[ -x "$dir/sw/bin/darwin-rebuild" ]] && nix build .\#darwinConfigurations.`hostname`.system -o "$dir" ! [[ -x "$dir/sw/bin/darwin-rebuild" ]] && nom build .\#darwinConfigurations.`hostname`.system -o "$dir"
"$dir/sw/bin/darwin-rebuild" --flake . {{args}} "$dir/sw/bin/darwin-rebuild" --flake . {{args}}
[private] [private]
[linux] [linux]
rebuild *args: rebuild *args:
sudo nixos-rebuild --flake . {{args}} sudo nixos-rebuild --flake . {{args}} |& nom
build *args: build *args:
@sudo true @sudo true
@just rebuild build {{args}} --log-format internal-json -v |& nom --json @just rebuild build {{args}}
@nvd diff /run/current-system result @nvd diff /run/current-system result
home *args: home *args:
@ -42,11 +42,8 @@ check *args:
@just rebuild test {{args}} @just rebuild test {{args}}
switch *args: switch *args:
#!/usr/bin/env -S bash -euo pipefail @just build {{args}}
just build {{args}} @gum confirm && just rebuild switch {{args}}
read -r -n 1 -p "Continue? [y/N]: " REPLY
[[ "$REPLY" =~ ^[Yy]$ ]] || exit 0
just rebuild switch {{args}}
fetch: fetch:
@nix shell nixpkgs\#onefetch nixpkgs\#scc -c sh -c "onefetch --true-color never --no-bots -d lines-of-code && scc --no-cocomo ." @nix shell nixpkgs\#onefetch nixpkgs\#scc -c sh -c "onefetch --true-color never --no-bots -d lines-of-code && scc --no-cocomo ."

View file

@ -82,7 +82,7 @@
}; };
devShells.default = config.pre-commit.devShell.overrideAttrs (old: { devShells.default = config.pre-commit.devShell.overrideAttrs (old: {
buildInputs = with pkgs; [gum nix-output-monitor nvd]; buildInputs = with pkgs; [gum just nix-output-monitor nvd];
}); });
legacyPackages.homeConfigurations = let legacyPackages.homeConfigurations = let