Merge branch 'dev' into rc

bin/omarchy-menu

@@ -222,7 +222,6 @@ show_font_menu() {
 show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
   [[ -f ~/.config/hypr/bindings.conf ]] && options="$options\n  Keybindings"
-  options="$options\n  Key Remapping"
   [[ -f ~/.config/hypr/input.conf ]] && options="$options\n  Input"
   options="$options\n󰱔  DNS\n  Security\n  Config"
 
@@ -235,7 +234,6 @@ show_setup_menu() {
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
   *Input*) open_in_editor ~/.config/hypr/input.conf ;;
-  *Key\ Remapping*) omarchy-setup-makima && open_in_editor "$HOME/.config/makima/AT Translated Set 2 keyboard.toml" && omarchy-restart-makima ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
@@ -557,10 +555,11 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth\n󰟸  Trackpad") in
   *Audio*) present_terminal omarchy-restart-pipewire ;;
   *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
   *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
+  *Trackpad*) present_terminal omarchy-restart-trackpad ;;
   *) show_update_menu ;;
   esac
 }

bin/omarchy-restart-makima

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Restart makima - key remapping service for remapping Copilot key to Omarchy Menu
-
-sudo systemctl restart makima

bin/omarchy-setup-makima

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Setup makima - key remapping service for remapping Copilot key to Omarchy Menu
-
-CONFIG_FILE="$HOME/.config/makima/AT Translated Set 2 keyboard.toml"
-
-if [[ ! -f $CONFIG_FILE ]]; then
-  omarchy-pkg-add makima-bin
-
-  mkdir -p "$HOME/.config/makima"
-  cp "$OMARCHY_PATH/default/makima/AT Translated Set 2 keyboard.toml" "$CONFIG_FILE"
-
-  sudo mkdir -p /etc/systemd/system/makima.service.d
-  sudo tee /etc/systemd/system/makima.service.d/override.conf >/dev/null <<EOF
-[Service]
-User=$USER
-Environment="MAKIMA_CONFIG=/home/$USER/.config/makima"
-EOF
-
-  sudo systemctl daemon-reload
-  sudo systemctl enable --now makima 2>/dev/null || true
-fi

default/hypr/bindings/utilities.conf

@@ -4,6 +4,7 @@ bindd = SUPER CTRL, E, Emoji picker, exec, omarchy-launch-walker -m symbols
 bindd = SUPER CTRL, C, Capture menu, exec, omarchy-menu capture
 bindd = SUPER CTRL, O, Toggle menu, exec, omarchy-menu toggle
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
+bindd = SUPER SHIFT, code:201, Omarchy menu (Copilot key), exec, omarchy-menu
 bindd = SUPER, ESCAPE, System menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
 bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings

default/makima/AT Translated Set 2 keyboard.toml

@@ -1,7 +0,0 @@
-# Run omarchy-restart-makima after any changes
-
-[remap]
-KEY_LEFTMETA-KEY_LEFTSHIFT-KEY_F23 = ["KEY_LEFTMETA", "KEY_LEFTALT", "KEY_SPACE"]
-
-[settings]
-GRAB_DEVICE = "true"

install/config/theme.sh

@@ -22,3 +22,6 @@ sudo chmod a+rw /etc/chromium/policies/managed
 
 sudo mkdir -p /etc/brave/policies/managed
 sudo chmod a+rw /etc/brave/policies/managed
+
+# Default Chromium to follow system appearance ("device") instead of dark
+echo '{"browser":{"theme":{"color_scheme":0}}}' | sudo tee /usr/lib/chromium/initial_preferences >/dev/null

migrations/1775946416.sh

@@ -0,0 +1,9 @@
+echo "Set Chromium appearance mode to device (follow system) by default"
+
+echo '{"browser":{"theme":{"color_scheme":0}}}' | sudo tee /usr/lib/chromium/initial_preferences >/dev/null
+
+# Update existing Chromium profiles to use "device" instead of "dark"
+PREFS="$HOME/.config/chromium/Default/Preferences"
+if [[ -f "$PREFS" ]] && command -v jq &>/dev/null; then
+  jq '.browser.theme.color_scheme = 0' "$PREFS" > "$PREFS.tmp" && mv "$PREFS.tmp" "$PREFS"
+fi

migrations/1775954402.sh

@@ -0,0 +1,11 @@
+echo "Remove makima key remapping service (Copilot key now handled natively by Hyprland)"
+
+if systemctl is-enabled makima &>/dev/null; then
+  sudo systemctl disable --now makima
+fi
+
+sudo rm -rf /etc/systemd/system/makima.service.d
+sudo rm -f /etc/udev/rules.d/99-uinput.rules
+rm -rf "$HOME/.config/makima"
+
+omarchy-pkg-drop makima-bin