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

Compare commits

base: aires:de40903fd2b2b551ec60fa4637b4bf6631614d25
Branches Tags
aires:main
aires:aux-template
...
compare: aires:9853d50233c4ccef746df027cac83dd70acd9992
Branches Tags
aires:main
aires:aux-template

2 commits
de40903fd2 ... 9853d50233

Author SHA1 Message Date
Aires 9853d50233 Merge branch 'main' of ssh://code.8bitbuddhism.com/aires/nix-configuration 2024-08-06 09:32:25 -04:00
Aires d1b678f69e Services: fix (hopefully) autoupgrade script per https://discourse.nixos.org/t/sudo-uid-issues/9133 2024-08-06 09:32:21 -04:00
1 changed files with 6 additions and 6 deletions
Show stats Expand all files Collapse all files

12
modules/services/autoupgrade.nix
View file

@ -63,12 +63,12 @@ in
cd ${cfg.configDir} cd ${cfg.configDir}
# Check if there are changes from Git. # Check if there are changes from Git.
echo "Pulling latest version..." echo "Pulling latest version..."
sudo -u ${cfg.user} git fetch /run/wrappers/bin/sudo -u ${cfg.user} git fetch
sudo -u ${cfg.user} git diff --quiet --exit-code ${cfg.branches.local} ${cfg.branches.remoteName}/${cfg.branches.remote} || true /run/wrappers/bin/sudo -u ${cfg.user} git diff --quiet --exit-code ${cfg.branches.local} ${cfg.branches.remoteName}/${cfg.branches.remote} || true
# If we have changes (git diff returns 1), pull changes and run the update # If we have changes (git diff returns 1), pull changes and run the update
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
echo "Updates found, running nixos-rebuild..." echo "Updates found, running nixos-rebuild..."
sudo -u ${cfg.user} git pull --recurse-submodules /run/wrappers/bin/sudo -u ${cfg.user} git pull --recurse-submodules
nixos-rebuild switch --flake . nixos-rebuild switch --flake .
else else
echo "No updates found. Exiting." echo "No updates found. Exiting."
@ -99,9 +99,9 @@ in
cd ${cfg.configDir} cd ${cfg.configDir}
# Make sure we're up-to-date # Make sure we're up-to-date
echo "Pulling the latest version..." echo "Pulling the latest version..."
sudo -u ${cfg.user} git pull --recurse-submodules /run/wrappers/bin/sudo -u ${cfg.user} git pull --recurse-submodules
sudo -u ${cfg.user} nix flake update --commit-lock-file /run/wrappers/bin/sudo -u ${cfg.user} nix flake update --commit-lock-file
sudo -u ${cfg.user} git push /run/wrappers/bin/sudo -u ${cfg.user} git push
''; '';
}; };