From f065ddb10821bb39327a52f7d26d7e24a8e13cfa Mon Sep 17 00:00:00 2001
From: Luca Bilke <bilke@tralios.de>
Date: Tue, 21 Mar 2023 19:21:09 +0100
Subject: [PATCH] cleanup

---
 .config/X11/xkb/keymap/default       |  2 +-
 .config/X11/xkb/symbols/custom       | 65 +++++++---------------------
 .config/kitty/kitty.conf             |  2 +-
 .local/share/icons/tokyonight-icons  |  1 -
 .local/share/themes/tokyonight-theme |  1 -
 5 files changed, 18 insertions(+), 53 deletions(-)
 delete mode 160000 .local/share/icons/tokyonight-icons
 delete mode 160000 .local/share/themes/tokyonight-theme

diff --git a/.config/X11/xkb/keymap/default b/.config/X11/xkb/keymap/default
index a3faa2ee..f67fa298 100644
--- a/.config/X11/xkb/keymap/default
+++ b/.config/X11/xkb/keymap/default
@@ -2,6 +2,6 @@ default xkb_keymap {
 	xkb_keycodes  { include "evdev+aliases(qwerty)" };
 	xkb_types     { include "complete" };
 	xkb_compat    { include "complete" };
-	xkb_symbols   { include "pc+us(dvorak)+inet(evdev)+capslock(super)+custom(ralt_mod3)+custom(group2_dvorak)" };
+	xkb_symbols   { include "pc+custom(dvorak)+inet(evdev)" };
 	xkb_geometry  { include "pc(pc105)" };
 };
diff --git a/.config/X11/xkb/symbols/custom b/.config/X11/xkb/symbols/custom
index 8c459156..270a004c 100644
--- a/.config/X11/xkb/symbols/custom
+++ b/.config/X11/xkb/symbols/custom
@@ -1,52 +1,19 @@
-// capslock as mod4
-partial modifier_keys
-xkb_symbols "caps_mod4" {
-    key <CAPS> { [ Super_L ] };
-    modifier_map Mod4 { <CAPS> };
-};
-
-// ralt as mod3
-partial modifier_keys
-xkb_symbols "ralt_mod3" {
-    include "group(switch)"
-    replace key <MENU> {
-        [ VoidSymbol, VoidSymbol ]
-    };
-    modifier_map Mod3 { <MENU> };
-};
-
-// group2 map for üöäß and some other things
 partial alphanumeric_keys
-xkb_symbols "group2_dvorak" {
-    key <AC01> { // A
-        symbols[Group2] = [ adiaeresis, Adiaeresis ]
-    };
-    key <AC02> { // O
-        symbols[Group2] = [ odiaeresis, Odiaeresis ]
-    };
-    key <AC04> { // U
-        symbols[Group2] = [ udiaeresis, Udiaeresis ]
-    };
-    key <AC10> { // S
-        symbols[Group2] = [ ssharp, ssharp ]
-    };
-    key <AB07> { // M
-        symbols[Group2] = [ mu, heart ]
-    };
-    key <TLDE> { // ~
-        symbols[Group2] = [ degree, infinity ]
-    };
-//     key <BKSP> {
-//         symbols[Group2] = [ BackSpace, BackSpace ]
-//     };
-//     key <SPCE> {
-//         symbols[Group2] = [ nobreakspace, nobreakspace ]
-//     };
-//     key <TAB> {
-//         symbols[Group2] = [ Tab, Tab ]
-//     };
-//     key <BKSP> {
-//         symbols[Group2] = [ BackSpace, BackSpace ]
-//     };
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+    name[Group1] = "English (Dvorak, custom level 3)";
+
+    key <TLDE>  { [grave,      asciitilde, degree                 ] };
+    key <AE04>  { [4,          dollar,     EuroSign               ] };
+
+    key <AC01>  { [a,          A,          adiaeresis, Adiaeresis ] };
+    key <AC02>  { [o,          O,          odiaeresis, Odiaeresis ] };
+    key <AC04>  { [u,          U,          udiaeresis, Udiaeresis ] };
+    key <AC10> { [s,          S,          ssharp                 ] };
+
+    key <BKSL>  { [ backslash, bar,        notsign,    brokenbar  ] };
+
+    include "level3(ralt_switch)"
+    include "capslock(super)"
 };
 
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index de4450f9..4d992e46 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -109,7 +109,7 @@ map kitty_mod+minus change_font_size all -2.0
 map kitty_mod+backspace change_font_size all 0
 
 # Select and act on visible text
-map kitty_mod+f>+u kitten hints --type url --program @
+map kitty_mod+f>u kitten hints --type url --program @
 map kitty_mod+f>shift+u kitten hints --type url --program
 map kitty_mod+f>p kitten hints --type path --program @
 map kitty_mod+f>shift+p kitten hints --type path --program
diff --git a/.local/share/icons/tokyonight-icons b/.local/share/icons/tokyonight-icons
deleted file mode 160000
index c522c6a5..00000000
--- a/.local/share/icons/tokyonight-icons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c522c6a5dd1cb8d53c8bfc47745f313a734eea61
diff --git a/.local/share/themes/tokyonight-theme b/.local/share/themes/tokyonight-theme
deleted file mode 160000
index 67c4bb6d..00000000
--- a/.local/share/themes/tokyonight-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67c4bb6d6bb415acea9d1c9a97152083d7f9c724