From 78b4c3b48c272de0535bcdf9fa20d1cec9361617 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 1 Nov 2023 07:54:45 -0400 Subject: justfile: only use rebuild recipe --- justfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/justfile b/justfile index 0b3200c..48de13a 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,8 @@ alias u := update alias ui := update-input rebuildArgs := "--verbose" -rebuild := if os() == "macos" { "darwin-rebuild" } else { "nixos-rebuild" } +rebuild := if os() == "macos" {"darwin-rebuild"} else {"nixos-rebuild"} +asRoot := if os() == "linux" {"true"} else {"false"} default: @just --choose @@ -19,14 +20,8 @@ default: [linux] [macos] [private] -rebuild subcmd: - {{ rebuild }} {{ subcmd }} {{ rebuildArgs }} --flake . - -[linux] -[macos] -[private] -rebuildRoot subcmd: - {{ if os() == "macos" { "" } else { "sudo " } }} {{ rebuild }} {{ subcmd }} {{ rebuildArgs }} --flake . +rebuild subcmd root="false": + {{ if root == "true" {"sudo "} else {""} }}{{rebuild}} {{subcmd}} {{rebuildArgs}} --flake . [linux] [macos] @@ -52,14 +47,14 @@ pre-commit: [linux] [macos] switch: - just rebuildRoot switch + just rebuild switch {{asRoot}} switch-and-deploy: switch deploy-all [linux] [macos] test: - just rebuildRoot test + just rebuild test {{asRoot}} update: nix flake update -- cgit v1.2.3