diff --git a/modules/bin/nix-scripts.nix b/modules/bin/nix-scripts.nix index bb16449..df1ea08 100644 --- a/modules/bin/nix-scripts.nix +++ b/modules/bin/nix-scripts.nix @@ -13,12 +13,30 @@ echo "NixOS Rebuilding..." ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current) - ${pkgs.git}/bin/git commit --no-gpg-sign -am "$gen" + ${pkgs.git}/bin/git commit --no-gpg-sign -am "Generation $gen" + popd + ''; + upgrade = + pkgs.writeShellScriptBin ".nixos-upgrade" + '' + set -e + pushd ~/.nixos/ + if [ -n "$(${pkgs.git}/bin/git status --porcelain)" ]; then + echo ".nixos is unclean!" + exit 1 + fi + echo "Updating nix-flake..." + nix flake update . + echo "NixOS Rebuilding..." + ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos + gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current) + ${pkgs.git}/bin/git commit --no-gpg-sign -am "Upgrade $gen" popd ''; in { environment.systemPackages = [ pkgs.bash rebuild + upgrade ]; }