From 34d6bfb809b3f0cad0491ea0382940522831d2b8 Mon Sep 17 00:00:00 2001 From: Gustav Bruhn Date: Tue, 18 Mar 2025 20:39:34 +0100 Subject: [PATCH] 22 current 2025-03-18 20:39:32 25.05.20250315.c80f6a7 6.12.19 * --- hosts/framework/configuration.nix | 4 ++-- update.sh | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix index f62296e..4f68c13 100644 --- a/hosts/framework/configuration.nix +++ b/hosts/framework/configuration.nix @@ -88,8 +88,8 @@ ]; }; - # Set default shell - # users.defaultUserShell = pkgs.zsh; + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; home-manager = { extraSpecialArgs = {inherit inputs;}; diff --git a/update.sh b/update.sh index d1fa98d..37e775d 100644 --- a/update.sh +++ b/update.sh @@ -3,21 +3,23 @@ set -e pushd ~/nixos/ +test=$(git diff --quiet '*.nix'):W +git add . alejandra . &>/dev/null \ || (alejandra . ; echo "formatting failed!" && exit 1) -git add . + echo "Rebuilding" sudo nixos-rebuild switch --upgrade --flake . current=$(nixos-rebuild list-generations | grep current) -if git diff --quiet '*.nix'; then +if test; then popd - notify-send -e "Nixos updated with no config changes" --icon=software-update-avaiable + exit 0 fi git commit -am "$current"