From b6f4118a6ba77f1edfebaae4d7031919866811ed Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 28 Dec 2024 11:30:30 -0600 Subject: [PATCH] Minor fixes --- profiles/personal/home.nix | 6 ------ scripts/update.sh | 4 +--- system/bin/phoenix.nix | 9 +++------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/profiles/personal/home.nix b/profiles/personal/home.nix index 5319d5bc..3865a8c8 100644 --- a/profiles/personal/home.nix +++ b/profiles/personal/home.nix @@ -24,11 +24,5 @@ ]; xdg.enable = true; - xdg.userDirs = { - extraConfig = { - XDG_GAME_DIR = "${config.home.homeDirectory}/Media/Games"; - XDG_GAME_SAVE_DIR = "${config.home.homeDirectory}/Media/Game Saves"; - }; - }; } diff --git a/scripts/update.sh b/scripts/update.sh index ee4b5929..e8804860 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -7,7 +7,5 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Update flake pushd $SCRIPT_DIR/.. &> /dev/null; -sudo nix flake update; -sudo nix-channel --update; -nix-channel --update; +sudo nix flake update "$@"; popd &> /dev/null; diff --git a/system/bin/phoenix.nix b/system/bin/phoenix.nix index 3d88c100..029c624b 100644 --- a/system/bin/phoenix.nix +++ b/system/bin/phoenix.nix @@ -21,20 +21,17 @@ let myScript = '' ''+userSettings.dotfilesDir+''/scripts/sync-posthook.sh; exit 0; elif [ "$1" = "update" ]; then - if [ "$#" -gt 1 ]; then - echo "Warning: The 'update' command has no subcommands (no $2 subcommand)"; - fi - ''+userSettings.dotfilesDir+''/scripts/update.sh; + ''+userSettings.dotfilesDir+''/scripts/update.sh "''${@:2}"; exit 0; elif [ "$1" = "upgrade" ]; then if [ "$#" -gt 1 ]; then - echo "Warning: The 'update' command has no subcommands (no $2 subcommand)"; + echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)"; fi ''+userSettings.dotfilesDir+''/scripts/upgrade.sh; exit 0; elif [ "$1" = "pull" ]; then if [ "$#" -gt 1 ]; then - echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)"; + echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)"; fi ''+userSettings.dotfilesDir+''/scripts/pull.sh; exit 0;