Merge pull request #2622 from basecamp/dev

v3.1.1

bin/omarchy-install-terminal

@@ -8,12 +8,14 @@ fi
 package="$1"
 
 # Install package
-omarchy-pkg-add $package
+if omarchy-pkg-add $package; then
+  # Set as default terminal
+  echo "Setting $package as new default terminal..."
+  sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
 
-# Set as default terminal
-echo "Setting $package as new default terminal..."
-sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
-
-# Restart is needed for new default to take effect
-echo
-gum confirm "Restart to use new terminal?" && systemctl reboot --no-wall
+  # Restart is needed for new default to take effect
+  echo
+  gum confirm "Restart to use new terminal?" && systemctl reboot --no-wall
+else
+  echo "Failed to install $package"
+fi

bin/omarchy-windows-vm

@@ -58,8 +58,8 @@ Categories=System;Virtualization;
 EOF
 
   # Get system resources
-  TOTAL_RAM=$(free -h | grep "^Mem:" | awk '{print $2}')
-  TOTAL_RAM_GB=$(free -g | grep "^Mem:" | awk '{print $2}')
+  TOTAL_RAM=$(free -h | awk 'NR==2 {print $2}')
+  TOTAL_RAM_GB=$(awk 'NR==1 {printf "%d", $2/1024/1024}' /proc/meminfo)
   TOTAL_CORES=$(nproc)
 
   echo ""

default/hypr/bindings/clipboard.conf

@@ -1,5 +1,5 @@
 # Copy / Paste
-bind = SUPER, C, sendshortcut, CTRL, Insert,
-bind = SUPER, V, sendshortcut, SHIFT, Insert,
-bind = SUPER, X, sendshortcut, CTRL, X,
+bindd = SUPER, C, Copy, sendshortcut, CTRL, Insert,
+bindd = SUPER, V, Paste, sendshortcut, SHIFT, Insert,
+bindd = SUPER, X, Cut, sendshortcut, CTRL, X,
 bindd = SUPER CTRL, V, Clipboard, exec, omarchy-launch-walker -m clipboard

default/hypr/bindings/tiling-v2.conf

@@ -7,6 +7,7 @@ bindd = SUPER, J, Toggle split, togglesplit, # dwindle
 bindd = SUPER, P, Pseudo window, pseudo, # dwindle
 bindd = SUPER, T, Toggle floating, togglefloating,
 bindd = SUPER, F, Force full screen, fullscreen, 0
+bindd = SUPER CTRL, F, Tiled full screen, fullscreenstate, 0 2
 bindd = SUPER ALT, F, Full width, fullscreen, 1
 
 # Move focus with SUPER + arrow keys
@@ -63,8 +64,8 @@ bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100
 bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100
 
 # Scroll through existing workspaces with SUPER + scroll
-bindd = SUPER, MOUSE_DOWN, Scroll active workspace forward, workspace, e+1
-bindd = SUPER, MOUSE_UP, Scroll active workspace backward, workspace, e-1
+bindd = SUPER, mouse_down, Scroll active workspace forward, workspace, e+1
+bindd = SUPER, mouse_up, Scroll active workspace backward, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindmd = SUPER, mouse:272, Move window, movewindow

migrations/1758107878.sh

@@ -1,26 +0,0 @@
-echo "Migrate to Walker 2.0.0"
-
-# Ensure we kill walker even if there's a restarting service running
-kill -9 $(pgrep -x walker)
-
-omarchy-pkg-drop walker-bin walker-bin-debug
-
-omarchy-pkg-add elephant \
-  elephant-calc \
-  elephant-clipboard \
-  elephant-bluetooth \
-  elephant-desktopapplications \
-  elephant-files \
-  elephant-menus \
-  elephant-providerlist \
-  elephant-runner \
-  elephant-symbols \
-  elephant-unicode \
-  elephant-websearch \
-  elephant-todo \
-  walker
-
-source $OMARCHY_PATH/install/config/walker-elephant.sh
-
-rm -rf ~/.config/walker/themes
-omarchy-refresh-walker

migrations/1758107879.sh

@@ -0,0 +1,45 @@
+echo "Migrate to Walker 2.0.0"
+
+NEEDS_MIGRATION=false
+
+PACKAGES=(
+  "elephant"
+  "elephant-calc"
+  "elephant-clipboard"
+  "elephant-bluetooth"
+  "elephant-desktopapplications"
+  "elephant-files"
+  "elephant-menus"
+  "elephant-providerlist"
+  "elephant-runner"
+  "elephant-symbols"
+  "elephant-unicode"
+  "elephant-websearch"
+  "elephant-todo"
+  "walker"
+)
+
+for pkg in "${PACKAGES[@]}"; do
+  if ! omarchy-pkg-present "$pkg"; then
+    NEEDS_MIGRATION=true
+    break
+  fi
+done
+
+WALKER_MAJOR=$(walker -v 2>&1 | grep -oP '^\d+' || echo "0")
+if [[ "$WALKER_MAJOR" -lt 2 ]]; then
+  NEEDS_MIGRATION=true
+fi
+
+if $NEEDS_MIGRATION; then
+  kill -9 $(pgrep -x walker) 2>/dev/null || true
+
+  omarchy-pkg-drop walker-bin walker-bin-debug
+
+  omarchy-pkg-add "${PACKAGES[@]}"
+
+  source $OMARCHY_PATH/install/config/walker-elephant.sh
+
+  rm -rf ~/.config/walker/themes
+  omarchy-refresh-walker
+fi

version

@@ -1 +1 @@
-3.1.0
+3.1.1