git rebase

base.nix

@@ -69,7 +69,7 @@
       # Update nixbook configs
       ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook reset --hard
       ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook clean -fd
-      ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook pull
+      ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook pull --rebase
 
       # Flatpak Updates
       ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.flatpak}/bin/flatpak update --noninteractive --assumeyes

base_lite.nix

@@ -52,7 +52,7 @@
       set -eu
       ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook reset --hard
       ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook clean -fd
-      ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook pull
+      ${pkgs.coreutils-full}/bin/nice -n 19 ${pkgs.util-linux}/bin/ionice -c 3 ${pkgs.git}/bin/git -C /etc/nixbook pull --rebase
 
       # Get the timestamp of the current generation
       last_gen_time=$(${pkgs.nix}/bin/nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gawk}/bin/awk 'END {print $2, $3}')

powerwash.sh

@@ -4,7 +4,10 @@ read -p "Do you want to continue? (y/n): " answer
 if [[ "$answer" =~ ^[Yy]$ ]]; then
 echo "Powerwashing NixBook..."
   # Get latest nixbook code
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook reset --hard
+  sudo git -C /etc/nixbook clean -fd
+  sudo git -C /etc/nixbook pull --rebase
+  
 
   # Erase data and set up home directory again
   rm -rf ~/

powerwash_lite.sh

@@ -5,7 +5,10 @@ read -p "Do you want to continue? (y/n): " answer
 if [[ "$answer" =~ ^[Yy]$ ]]; then
 echo "Powerwashing NixBook Lite..."
   # Get latest nixbook code
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook reset --hard
+  sudo git -C /etc/nixbook clean -fd
+  sudo git -C /etc/nixbook pull --rebase
+  
 
   # Erase data and set up home directory again
   rm -rf ~/

update.sh

@@ -7,7 +7,7 @@ if [[ "$answer" =~ ^[Yy]$ ]]; then
   # Download the latest nixbook changes
   sudo git -C /etc/nixbook reset --hard
   sudo git -C /etc/nixbook clean -fd
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook pull --rebase
 
   # Update the nixos nix-channel to be the same as config.system.autoUpgrade.channel in base.nix or base_lite.nix
   AUTOUPDATE_CHANNEL="$(sudo nix-instantiate --eval '<nixpkgs/nixos>' -A config.system.autoUpgrade.channel | tr -d '"')"

update_lite.sh

@@ -7,7 +7,7 @@ if [[ "$answer" =~ ^[Yy]$ ]]; then
   # Download the latest nixbook changes
   sudo git -C /etc/nixbook reset --hard
   sudo git -C /etc/nixbook clean -fd
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook pull --rebase
 
   # Update the nixos nix-channel to be the same as config.system.autoUpgrade.channel in base.nix or base_lite.nix
   AUTOUPDATE_CHANNEL="$(sudo nix-instantiate --eval '<nixpkgs/nixos>' -A config.system.autoUpgrade.channel | tr -d '"')"

update_shutdown.sh

@@ -7,7 +7,7 @@ if [[ "$answer" =~ ^[Yy]$ ]]; then
   # Download the latest nixbook changes
   sudo git -C /etc/nixbook reset --hard
   sudo git -C /etc/nixbook clean -fd
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook pull --rebase
 
   # Update the nixos nix-channel to be the same as config.system.autoUpgrade.channel in base.nix or base_lite.nix
   AUTOUPDATE_CHANNEL="$(sudo nix-instantiate --eval '<nixpkgs/nixos>' -A config.system.autoUpgrade.channel | tr -d '"')"

update_shutdown_lite.sh

@@ -7,7 +7,7 @@ if [[ "$answer" =~ ^[Yy]$ ]]; then
   # Download the latest nixbook changes
   sudo git -C /etc/nixbook reset --hard
   sudo git -C /etc/nixbook clean -fd
-  sudo git -C /etc/nixbook pull
+  sudo git -C /etc/nixbook pull --rebase
 
   # Update the nixos nix-channel to be the same as config.system.autoUpgrade.channel in base.nix or base_lite.nix
   AUTOUPDATE_CHANNEL="$(sudo nix-instantiate --eval '<nixpkgs/nixos>' -A config.system.autoUpgrade.channel | tr -d '"')"