aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

General: cleanup NixOS helper script

Browse source
This commit is contained in:
Aires 2024-09-29 16:06:16 -04:00
parent 0996a02659
commit b34a43ed4c
2 changed files with 86 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
bin/nixos-upgrade-script.sh
View file

@ -7,46 +7,26 @@ hostname=$(hostname) # The name of the host to build
flakeDir="." # Path to the flake file (and optionally the hostname)
remainingArgs="" # All remaining arguments that haven't been processed
commit=true # Whether to update git (true by default)
buildHost="" # Which host to build the system on.
function usage() {
echo "Usage: nixos-upgrade-script.sh [-o|--operation operation] [-f|--flake path-to-flake-file] [extra nixos-rebuild parameters]"
echo "Options:"
echo " -h | --help Show this help screen."
echo " -o | --operation The nixos-rebuild operation to perform."
echo " -H | --host The host to build."
echo " -f | --flake <path> The path to the flake file (and optionally the hostname)."
echo " -f | --flake <path> The path to the flake file."
echo " -n | --no-commit Don't update and commit the lock file."
echo " --build-host <hostname> The SSH name of the host to build the system on."
exit 2
}
function run_operation {
echo "Full operation: nixos-rebuild $1 --flake $flakeDir#$hostname $( [ "$buildHost" != "" ] && echo "--build-host $buildHost" ) $remainingArgs --use-remote-sudo"
nixos-rebuild $operation --flake .#$hostname $remainingArgs --use-remote-sudo --log-format multiline-with-logs
# Only request super-user permission if we're switching
#if [[ "$1" =~ ^(switch|boot|test)$ ]]; then
# nixos-rebuild $operation --flake .#$hostname $remainingArgs --use-remote-sudo
#else
# nixos-rebuild $operation --flake .#$hostname $remainingArgs
#fi
echo "Running this operation: nixos-rebuild $1 --flake $flakeDir $remainingArgs --use-remote-sudo"
nixos-rebuild $operation --flake $flakeDir $remainingArgs --use-remote-sudo --log-format multiline-with-logs
}
# Argument processing logic shamelessly stolen from https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash
POSITIONAL_ARGS=()
while [[ $# -gt 0 ]]; do
case "$1" in
--build-host|-b)
buildHost="$2"
shift
shift
;;
--host|--hostname|-H)
hostname="$2"
shift
shift
;;
--flake|-f)
flakeDir="$2"
shift
@ -75,11 +55,20 @@ done
remainingArgs=${POSITIONAL_ARGS[@]}
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
if [ -z "${FLAKE_DIR}" ]; then
echo "Flake directory not specified. Use '--flake [directory]' or set the $FLAKE_DIR environment variable."
exit 1
else
flakeDir=$FLAKE_DIR
fi
cd $flakeDir
echo "Pulling the latest version of the repository..."
git pull
if [ $commit = true ]; then
echo "Update and push lock file"
echo "Checking for updates..."
nix flake update --commit-lock-file
git push
fi

13
modules/system/nix.nix
View file

@ -26,7 +26,8 @@ in
nixos-upgrade-script.enable = lib.mkEnableOption "Installs the nos (nixos-upgrade-script) helper script.";
};
};
config = {
config = lib.mkMerge [
{
nixpkgs.config.allowUnfree = cfg.allowUnfree;
nix = {
settings = {
@ -95,7 +96,11 @@ in
# Support for standard, dynamically-linked executables
programs.nix-ld.enable = true;
aux.system.packages = [ (lib.mkIf cfg.nixos-upgrade-script.enable nixos-upgrade-script) ];
};
}
(lib.mkIf cfg.nixos-upgrade-script.enable {
# Enable and configure NOS
aux.system.packages = [ nixos-upgrade-script ];
environment.variables."FLAKE_DIR" = config.secrets.nixConfigFolder;
})
];
}