Revert "#1891 docs: describe the Lua keybind configuration and add a transition guide"

CHANGELOG.md

@@ -8,16 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## Unreleased
 
-### Added
-- Docs: `MIGRATION-LUA.md`, a transition guide for upgrading from the hyprlang configuration — what moved where, the silent failures and their causes, and the files the upgrade leaves behind
-
 ### Removed
 - Hyprland: dropped the legacy hyprlang dot, the files it deployed no longer exist
 
 ### Fixed
-- Docs: the keybinding reference describes the Lua configuration instead of the removed `userprefs.conf`, documents binds that were missing from it, corrects four descriptions that no longer matched the code, and explains why an override needs the original bind's flags
-- Docs: the shipped `hypr/hyprland.lua` stub shows a working bind instead of pointing at a wiki that does not exist
-- Docs: the keybinding links in the German, Arabic, French, Dutch and Turkish readmes resolve again
 - Core: app launchers no longer show a false error when an unrelated `DEBUG` variable contains a non-boolean value such as `release`
 - Desktop: the generated battery notification startup command now launches `batterynotify.lua` instead of the removed shell implementation
 - Hyprland: Lua keybinds again match the documented shortcuts for window management, screenshots, wallpapers, Waybar, selectors, workspaces and the scratchpad

Configs/.config/hypr/hyprland.lua

@@ -1,28 +1,5 @@
--- Your Hyprland configuration. HyDE never overwrites this file.
---
--- It loads after HyDE's own binds, so settings here take precedence. Replacing
--- a bind needs more than that: see below. HyDE's defaults live in
--- ~/.local/share/hypr/lua/ and are overwritten on every update, so edits there
--- do not survive.
---
--- Adding a keybind:
---
---     hl.bind("SUPER + SPACE", hl.dsp.exec_cmd(hyde.sh.gamelauncher()), {
---         description = "[Utilities] game launcher",
---     })
---
--- Replacing one of HyDE's: bind the same combination again and yours takes
--- over, but copy its flags across as well. A bind counts as the same one only
--- when its flags match, and `description` is not a flag — miss one and both
--- binds stay live on that combination. Copy the whole options table from
--- ~/.local/share/hypr/lua/key_binds.lua and change only what you need:
---
---     hl.bind("F9", hl.dsp.exec_cmd(hyde.sh.volumecontrol("-o", "m")), {
---         locked = true,
---         description = "[Hardware Controls|Audio] un/mute output",
---     })
---
--- Press SUPER + / to see what is actually loaded, your own binds included.
--- The full reference is KEYBINDINGS.md in the HyDE repository.
---
--- Other Lua files next to this one can be pulled in with require("name").
+-- User Configuration goeas here.
+-- Adding keybinding are simple, refer to the wiki and add it here!
+-- Duplicated keybinding will always respect the last last added, therefore please override keybindings as you wish.
+--- use "require()" to load other lua files, for example:
+-- require("keybindings") --- this will load "keybindings.lua"

Hyprdots-to-HyDE.md

@@ -67,14 +67,9 @@ Who are the $USER?
 
 ---
 
-Here's how we keep HyDE's Hyprland settings separate from yours. HyDE's own
-configuration lives in `~/.local/share/hypr/`, which it overwrites on every
-update, and yours goes in `~/.config/hypr/hyprland.lua`, which loads after it
-and is never touched. Anything else HyDE puts in `~/.config/hypr/` — the lock
-screen, idle and sunset configs — is left alone once it exists. So an update
-cannot overwrite your settings, and your settings cannot be lost with one.
-Your own file is still yours to get wrong: a Lua error in it will stop the
-session from starting, and a HyDE change may need a matching change there.
+Here's how we can update HyDE-specific Hyprland settings without changing user preferences. We don't need the "userprefs" file. Instead, we can source HyDE's `hyprland.conf` and make $USER preferred changes directly in the config. With this approach, you won't potentially break hyde and hyde won't break your own dots.
+
+![Hyprland structure](https://github.com/user-attachments/assets/91b35c2e-0003-458f-ab58-18fc29541268)
 
 # Why name it HyDE?
 

Source/docs/README.ar.md

@@ -28,7 +28,7 @@ Multi-language README support
 <a href="#التحديث"><kbd> <br> تحديث <br> </kbd></a>&ensp;&ensp;
 <a href="#السمات"><kbd> <br> السمات <br> </kbd></a>&ensp;&ensp;
 <a href="#الأنماط"><kbd> <br> الأنماط <br> </kbd></a>&ensp;&ensp;
-<a href="../assets/keybinds/KEYBINDINGS.ar.md"><kbd> <br> المفاتيح <br> </kbd></a>&ensp;&ensp;
+<a href="KEYBINDINGS.ar.md"><kbd> <br> المفاتيح <br> </kbd></a>&ensp;&ensp;
 <a href="https://www.youtube.com/watch?v=2rWqdKU1vu8&list=PLt8rU_ebLsc5yEHUVsAQTqokIBMtx3RFY&index=1"><kbd> <br> يوتيوب <br> </kbd></a>&ensp;&ensp;
 <a href="https://hydeproject.pages.dev/"><kbd> <br> ويكي <br> </kbd></a>&ensp;&ensp;
 <a href="https://discord.gg/qWehcFJxPa"><kbd> <br> ديسكورد <br> </kbd></a>

Source/docs/README.de.md

@@ -26,7 +26,7 @@ Mehrsprachige README-Unterstützung
   <a href="#aktualisieren"><kbd> <br> Aktualisieren <br> </kbd></a>&ensp;&ensp;
   <a href="#themen"><kbd> <br> Themen <br> </kbd></a>&ensp;&ensp;
   <a href="#stile"><kbd> <br> Stile <br> </kbd></a>&ensp;&ensp;
-  <a href="../assets/keybinds/KEYBINDINGS.de.md"><kbd> <br> Tastenkombinationen <br> </kbd></a>&ensp;&ensp;
+  <a href="KEYBINDINGS.de.md"><kbd> <br> Tastenkombinationen <br> </kbd></a>&ensp;&ensp;
   <a href="https://www.youtube.com/watch?v=2rWqdKU1vu8&list=PLt8rU_ebLsc5yEHUVsAQTqokIBMtx3RFY&index=1"><kbd> <br> Youtube <br> </kbd></a>&ensp;&ensp;
   <a href="https://hydeproject.pages.dev/"><kbd> <br> Wiki <br> </kbd></a>&ensp;&ensp;
   <a href="https://discord.gg/qWehcFJxPa"><kbd> <br> Discord <br> </kbd></a>

Source/docs/README.fr.md

@@ -29,7 +29,7 @@ Support multilingue pour le README
 <a href="#update"><kbd> <br> Mise à jour <br> </kbd></a>&ensp;&ensp;
 <a href="#themes"><kbd> <br> Thèmes <br> </kbd></a>&ensp;&ensp;
 <a href="#styles"><kbd> <br> Styles <br> </kbd></a>&ensp;&ensp;
-<a href="../assets/keybinds/KEYBINDINGS.fr.md"><kbd> <br> Raccourcis <br> </kbd></a>&ensp;&ensp;
+<a href="KEYBINDINGS.fr.md"><kbd> <br> Raccourcis <br> </kbd></a>&ensp;&ensp;
 <a href="https://www.youtube.com/watch?v=2rWqdKU1vu8&list=PLt8rU_ebLsc5yEHUVsAQTqokIBMtx3RFY&index=1"><kbd> <br> YouTube <br> </kbd></a>&ensp;&ensp;
 <a href="https://hydeproject.pages.dev/"><kbd> <br> Wiki <br> </kbd></a>&ensp;&ensp;
 <a href="https://discord.gg/qWehcFJxPa"><kbd> <br> Discord <br> </kbd></a>

Source/docs/README.nl.md

@@ -26,7 +26,7 @@ Multi-language README support
   <a href="#updaten"><kbd> <br> Updaten <br> </kbd></a>&ensp;&ensp;
   <a href="#thema's"><kbd> <br> Thema's <br> </kbd></a>&ensp;&ensp;
   <a href="#stijlen"><kbd> <br> Stijlen <br> </kbd></a>&ensp;&ensp;
-  <a href="../assets/keybinds/KEYBINDINGS.nl.md"><kbd> <br> Toetscombinaties <br> </kbd></a>&ensp;&ensp;
+  <a href="KEYBINDINGS.nl.md"><kbd> <br> Toetscombinaties <br> </kbd></a>&ensp;&ensp;
   <a href="https://www.youtube.com/watch?v=2rWqdKU1vu8&list=PLt8rU_ebLsc5yEHUVsAQTqokIBMtx3RFY&index=1"><kbd> <br> Youtube <br> </kbd></a>&ensp;&ensp;
   <a href="https://hydeproject.pages.dev/"><kbd> <br> Wiki <br> </kbd></a>&ensp;&ensp;
   <a href="https://discord.gg/qWehcFJxPa"><kbd> <br> Discord <br> </kbd></a>

Source/docs/README.tr.md

@@ -29,7 +29,7 @@ Multi-language README support
 <a href="#updating"><kbd> <br> Güncelleme <br> </kbd></a>&ensp;&ensp;
 <a href="#themes"><kbd> <br> Temalar <br> </kbd></a>&ensp;&ensp;
 <a href="#styles"><kbd> <br> Stiller <br> </kbd></a>&ensp;&ensp;
-<a href="../../KEYBINDINGS.md"><kbd> <br> Tuş atamaları <br> </kbd></a>&ensp;&ensp;
+<a href="KEYBINDINGS.md"><kbd> <br> Tuş atamaları <br> </kbd></a>&ensp;&ensp;
 <a href="https://www.youtube.com/watch?v=2rWqdKU1vu8&list=PLt8rU_ebLsc5yEHUVsAQTqokIBMtx3RFY&index=1"><kbd> <br> Youtube <br> </kbd></a>&ensp;&ensp;
 <a href="https://hydeproject.pages.dev/"><kbd> <br> Wiki <br> </kbd></a>&ensp;&ensp;
 <a href="https://discord.gg/qWehcFJxPa"><kbd> <br> Discord <br> </kbd></a>

tests/lua/bind_harness.lua

@@ -271,15 +271,7 @@ local required_defaults = {
     "SUPER + mouse_up",
     "SUPER + S",
     "SUPER + SHIFT + S",
-    "SUPER + ALT + S",
-    "SUPER + ALT + F4",
-    "ALT + P",
-    "ALT + SHIFT + TAB",
-    "SUPER + SHIFT + K",
-    "SUPER + SHIFT + slash",
-    "SUPER + CONTROL + M",
-    "SUPER + KP_1",
-    "SUPER + SHIFT + KP_1"
+    "SUPER + ALT + S"
 }
 
 for _, combo in ipairs(required_defaults) do