diff options
| author | Collin Williams <96917990+bluedragon1221@users.noreply.github.com> | 2026-02-12 11:06:56 -0600 |
|---|---|---|
| committer | Collin Williams <96917990+bluedragon1221@users.noreply.github.com> | 2026-02-12 11:07:09 -0600 |
| commit | 70cc9ded188b9d4d301e8a8ecb2dfb24d5c073ce (patch) | |
| tree | dff78100892cd5dca21b56b765cd243e87cd1880 /pkgs/yo.nix | |
| parent | d7a83a7dfbe71bbf5d8f2533a6d9442af9b01283 (diff) | |
various yo* changes
Diffstat (limited to 'pkgs/yo.nix')
| -rw-r--r-- | pkgs/yo.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/yo.nix b/pkgs/yo.nix index 6846046..11bab17 100644 --- a/pkgs/yo.nix +++ b/pkgs/yo.nix @@ -1,6 +1,22 @@ {pkgs, ...}: let yo = pkgs.writeText "yo.lua" '' - local SUDO = os.getenv("SUDO") or "sudo" + local CONF_FILE = os.getenv("HOME") .. "/.config/yo.conf" + + local conf = {} + for l in io.open(CONF_FILE):lines() do + if l:match("^(%a+)%s") then + local k, v = l:match("^(%a+)%s+(.*)$") + conf[k] = v + end + end + + local SUDO = "sudo" + if conf.sudo then + SUDO = conf.sudo + end + if os.getenv("SUDO") then + SUDO = os.getenv("SUDO") + end local function collectArgs(start) local start = start or 2 @@ -20,7 +36,7 @@ local flake = args.flake or "/home/collin/nixos" local extraArgs = table.concat(args.extraArgs or {}, " ") - cmd = ("nixos-rebuild %s --flake %s %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(verb, flake, extraArgs) + cmd = ("${pkgs.nixos-rebuild-ng}/bin/nixos-rebuild %s --flake %s %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(verb, flake, extraArgs) if sudo then local sudo_cmd = ("%s su -c '%s'"):format(SUDO, cmd) print("+ "..sudo_cmd) |