From 1732551873aae48a8418595ef9bc3b2cbb756b0c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 11 Apr 2026 20:41:42 -0400 Subject: [PATCH] Switch from makima to a straight copilot to omarchy menu mapping --- bin/omarchy-menu | 2 -- bin/omarchy-restart-makima | 5 ----- bin/omarchy-setup-makima | 22 ------------------- default/hypr/bindings/utilities.conf | 1 + .../makima/AT Translated Set 2 keyboard.toml | 7 ------ migrations/1775954402.sh | 11 ++++++++++ 6 files changed, 12 insertions(+), 36 deletions(-) delete mode 100755 bin/omarchy-restart-makima delete mode 100755 bin/omarchy-setup-makima delete mode 100644 default/makima/AT Translated Set 2 keyboard.toml create mode 100644 migrations/1775954402.sh diff --git a/bin/omarchy-menu b/bin/omarchy-menu index e845681f..3ee0ea5e 100755 --- a/bin/omarchy-menu +++ b/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 ;; diff --git a/bin/omarchy-restart-makima b/bin/omarchy-restart-makima deleted file mode 100755 index aa6ffa39..00000000 --- a/bin/omarchy-restart-makima +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# Restart makima - key remapping service for remapping Copilot key to Omarchy Menu - -sudo systemctl restart makima diff --git a/bin/omarchy-setup-makima b/bin/omarchy-setup-makima deleted file mode 100755 index 707465b4..00000000 --- a/bin/omarchy-setup-makima +++ /dev/null @@ -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 </dev/null || true -fi diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf index 55c293dd..3c3336a1 100644 --- a/default/hypr/bindings/utilities.conf +++ b/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 diff --git a/default/makima/AT Translated Set 2 keyboard.toml b/default/makima/AT Translated Set 2 keyboard.toml deleted file mode 100644 index 895e454f..00000000 --- a/default/makima/AT Translated Set 2 keyboard.toml +++ /dev/null @@ -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" diff --git a/migrations/1775954402.sh b/migrations/1775954402.sh new file mode 100644 index 00000000..61101d5c --- /dev/null +++ b/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