diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix index 11ad1986..5780f9a5 100644 --- a/home-manager/common/software/cli/fish.nix +++ b/home-manager/common/software/cli/fish.nix @@ -63,42 +63,10 @@ nixos-build-desktop $argv ls -lah ~/ | grep nixos ''; - nixos-build-pi-img-verbose = '' - pushd /etc/nixos/git - git pull - nix build .#imageConfigurations.nixos-rpi4-img --show-trace --verbose - cp result/sd-image/nixos-sd-image* ~/. - rm -f result - popd - ''; - nixos-build-linode-img-verbose = '' - pushd /etc/nixos/git - git pull - nix build .#imageConfigurations.nixos-linode-img --show-trace --verbose - cp result/nixos.img.gz ~/nixos-linode-`ddate`-`git rev-parse HEAD | cut -b 1-7`.img.gz - rm -f result - popd - ''; - nixos-build-console-verbose = '' - pushd /etc/nixos/git - git pull - nix build .#imageConfigurations.nixos-iso-console --show-trace --verbose - cp result/iso/nixos.iso ~/nixos-console-`ddate`-`git rev-parse HEAD | cut -b 1-7`.iso - rm -f result - popd - ''; - nixos-build-desktop-verbose = '' - pushd /etc/nixos/git - git pull - nix build .#imageConfigurations.nixos-iso-desktop --show-trace --verbose - cp result/iso/nixos.iso ~/nixos-desktop-`ddate`-`git rev-parse HEAD | cut -b 1-7`.iso - rm -f result - popd - ''; nixos-build-pi-img = '' pushd /etc/nixos/git git pull - nix build .#imageConfigurations.nixos-rpi4-img + nix build .#imageConfigurations.nixos-rpi4-img $argv cp result/sd-image/nixos-sd-image* ~/. rm -f result popd @@ -106,24 +74,24 @@ nixos-build-linode-img = '' pushd /etc/nixos/git git pull - nix build .#imageConfigurations.nixos-linode-img - cp result/nixos.img.gz ~/nixos-linode-`ddate`-`git rev-parse HEAD | cut -b 1-7`.img.gz + nix build .#imageConfigurations.nixos-linode-img $argv + cp result/nixos.img.gz ~/nixos-linode-$(ddate)-$(git rev-parse HEAD | cut -b 32-).img.gz rm -f result popd ''; nixos-build-console = '' pushd /etc/nixos/git git pull - nix build .#imageConfigurations.nixos-iso-console - cp result/iso/nixos.iso ~/nixos-console-`ddate`-`git rev-parse HEAD | cut -b 1-7`.iso + nix build .#imageConfigurations.nixos-iso-console $argv + cp result/iso/nixos.iso ~/nixos-console-$(ddate)-$(git rev-parse HEAD | cut -b 32-).iso rm -f result popd ''; nixos-build-desktop = '' pushd /etc/nixos/git git pull - nix build .#imageConfigurations.nixos-iso-desktop - cp result/iso/nixos.iso ~/nixos-desktop-`ddate`-`git rev-parse HEAD | cut -b 1-7`.iso + nix build .#imageConfigurations.nixos-iso-desktop $argv + cp result/iso/nixos.iso ~/nixos-desktop-$(ddate)-$(git rev-parse HEAD | cut -b 32-).iso rm -f result popd '';