Merge pull request #2622 from basecamp/dev

v3.1.1

bin/omarchy-install-hyprscrolling

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-echo "Installing hyprscrolling plugin"
-
-omarchy-pkg-add meson cpio cmake
-hyprpm update
-hyprpm add https://github.com/hyprwm/hyprland-plugins
-hyprpm enable hyprscrolling
-
-if ! grep -q '/hypr/scrolling\.conf' ~/.config/hypr/hyprland.conf; then
-  sed -i '/source = ~\/\.local\/share\/omarchy\/default\/hypr\/windows\.conf/a source = ~/.local/share/omarchy/default/hypr/scrolling.conf' ~/.config/hypr/hyprland.conf
-fi

bin/omarchy-install-vscode

@@ -3,7 +3,7 @@
 echo "Installing VSCode..."
 omarchy-pkg-add visual-studio-code-bin
 
-mkdir -p ~/.vscode ~/.config/Code/User
+mkdir -p ~/.vscode
 
 cat > ~/.vscode/argv.json << 'EOF'
 // This configuration file allows you to pass permanent command line arguments to VS Code.

bin/omarchy-menu

@@ -232,7 +232,7 @@ show_setup_security_menu() {
 }
 
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n󰍲  Windows\n  Gaming\n  Extra") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n󰍲  Windows\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -245,7 +245,6 @@ show_install_menu() {
   *AI*) show_install_ai_menu ;;
   *Windows*) present_terminal "omarchy-windows-vm install" ;;
   *Gaming*) show_install_gaming_menu ;;
-  *Extra*) show_install_extra_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -310,13 +309,6 @@ show_install_gaming_menu() {
   esac
 }
 
-show_install_extra_menu() {
-  case $(menu "Install" "  Hyprscrolling") in
-  *Hyprscrolling*) present_terminal omarchy-install-hyprscrolling ;;
-  *) show_install_menu ;;
-  esac
-}
-
 show_install_style_menu() {
   case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
   *Theme*) present_terminal omarchy-theme-install ;;

default/hypr/scrolling.conf

@@ -1,18 +0,0 @@
-plugin {
-    hyprscrolling {
-        column_width = 0.7
-        fullscreen_on_one_column = true
-        focus_fit_method = 1
-    }
-}
-
-general {
-    layout = scrolling
-}
-
-bindd = SUPER, period, Focus right window column, layoutmsg, move +col
-bindd = SUPER, comma, Focus left window column, layoutmsg, move -col
-bindd = SUPER SHIFT, period, Move window column right, layoutmsg, movewindowto r
-bindd = SUPER SHIFT, comma, Move window column left, layoutmsg, movewindowto l
-bindd = SUPER SHIFT, up, Move window column up, layoutmsg, movewindowto u
-bindd = SUPER SHIFT, down, Move window column down, layoutmsg, movewindowto d

migrations/1760974946.sh

@@ -1,21 +0,0 @@
-echo "Turn off VSCode's own auto-update feature (we rely on pacman)"
-
-# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
-# which jq doesn’t support.
-
-VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
-
-# If VSCode is installed, ensure that the "update.mode" setting is set to "none"
-if omarchy-cmd-present code; then
-  mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
-
-  if [[ ! -f "$VS_CODE_SETTINGS" ]]; then
-    # If settings.json doesn't exist, create it with just the update.mode setting
-    printf '{\n  "update.mode": "none"\n}\n' > "$VS_CODE_SETTINGS"
- elif ! grep -q '"update.mode"' "$VS_CODE_SETTINGS"; then
-    # Insert "update.mode": "none", immediately after the first "{"
-    # Use sed's first-match range (0,/{/) to only replace the first "{
-    sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
-  "update.mode": "none",/}' "$VS_CODE_SETTINGS"
-  fi
-fi

version

@@ -1 +1 @@
-3.2.0-Beta
+3.1.1