thelio76: script update

config/users/alex/default.nix

@@ -71,7 +71,7 @@
       extraConfig = ''
         polybar &
       '';
-      startupPrograms = [ "kitty" ];
+      startupPrograms = [ ];
     };
   };
 

quick-switch.sh

@@ -1,6 +1,14 @@
 #!/usr/bin/env bash 
 set -euo pipefail
 
+commitchanges="false"
+
+while getopts 'c' OPTION; do
+  case "$OPTION" in
+    c) commitchanges="true" ;;
+  esac
+done
+
 # Stolen from https://stackoverflow.com/a/29436423 
 function yes_or_no {
     while true; do
@@ -12,15 +20,22 @@ function yes_or_no {
     done
 }
 
+function reset_bspwm() {
+  pkill -USR1 -x sxhkd
+  sxhkd &
+  bspc wm -r
+}
+
 function apply() {
   git push --force-with-lease
   rev=$(git rev-parse HEAD)
   sudo nixos-rebuild switch \
     --flake "git+https://git.atauno.com/atau/nixos-config.git?ref=main&rev=$rev"
+  reset_bspwm
 }
 
 function commit_and_apply() {
-  read -p "Enter a commit message: " msg
+  read -p "Git working directory is unclean. Commit message: " msg
   git add .
   git commit -m "$(hostname): $msg"
   apply
@@ -30,6 +45,14 @@ if [ -z "$(git status --porcelain)" ]
 then
   apply
 else
-  yes_or_no "Git working directory is unclean, would you like to commit changes?" && commit_and_apply
+  if [ "$commitchanges" == "false" ]
+    then
+      echo "Using local flake..."
+      sudo nixos-rebuild switch --flake .
+      reset_bspwm
+    else
+      echo "Committing flake and pushing..."
+      commit_and_apply
+  fi
 fi