From e2fb5528500974b5764390d605bd731742d5d0fe Mon Sep 17 00:00:00 2001 From: cswimr Date: Thu, 30 Jan 2025 11:33:40 -0600 Subject: [PATCH] integrate `lock` functionality into `upd` --- config/xonsh/aliases.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/config/xonsh/aliases.py b/config/xonsh/aliases.py index a5ad7ca..c6f07b5 100644 --- a/config/xonsh/aliases.py +++ b/config/xonsh/aliases.py @@ -85,6 +85,10 @@ def _upd(args: list): run(["git", "pull"], cwd=path) else: args.remove("--no-pull") + if "--lock" in args: + args.remove("--lock") + print(f"{c.BLUE}Updating {c.YELLOW}Nix Flake{c.BLUE} lock file{c.END}") + run(["nix", "flake", "update", *args], cwd=path) if "--rewrite-hardware-configuration" in args: args.remove("--rewrite-hardware-configuration") print(f"{c.BLUE}Updating {c.YELLOW}NixOS{c.BLUE} hardware configuration file for {c.YELLOW}{gethostname()}{c.BLUE}{c.END}") @@ -111,14 +115,6 @@ def _upd(args: list): print(f"{c.RED}WARNING: The --impure flag is set!{c.END}") run(["sudo", "nixos-rebuild", subcommand, *args], cwd=path) -@aliases.register -def _lock(args): - path = Path("/etc/nixos") - if path.exists(): - c = colors.Colors - print(f"{c.BLUE}Updating {c.YELLOW}Nix Flake{c.BLUE} lock file{c.END}") - run(["nix", "flake", "update", *args], cwd=path) - @aliases.register @aliases.return_command def _edit(args):