From 310a4f1327c7240424f5c0d8e378844c778e71e4 Mon Sep 17 00:00:00 2001
From: Jack Foltz <jack@foltz.io>
Date: Wed, 12 Dec 2018 11:53:37 -0500
Subject: [PATCH] Fix up x11 keyboard layout and clean packages.yml

---
 lain/.config/fish/config.fish                 |  3 +++
 lain/.config/systemd/user/xmodmap@.service    | 15 ---------------
 lain/.config/systemd/user/xresources@.service | 15 ---------------
 lain/.config/x11/modmap                       |  5 -----
 lain/.config/xkb/map.xkb                      |  7 +++++++
 packages.yml                                  | 17 ++++++-----------
 scripts/xkb.fish                              |  1 +
 7 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 lain/.config/systemd/user/xmodmap@.service
 delete mode 100644 lain/.config/systemd/user/xresources@.service
 delete mode 100644 lain/.config/x11/modmap
 create mode 100644 lain/.config/xkb/map.xkb
 create mode 100755 scripts/xkb.fish

diff --git a/lain/.config/fish/config.fish b/lain/.config/fish/config.fish
index fae4b7d..222a94a 100644
--- a/lain/.config/fish/config.fish
+++ b/lain/.config/fish/config.fish
@@ -22,6 +22,9 @@ begin
     end
 end
 
+# Load keymap
+xkbcomp ~/.config/xkb/map.xkm $DISPLAY
+
 ### Aliases ###
 function ls
     exa $argv
diff --git a/lain/.config/systemd/user/xmodmap@.service b/lain/.config/systemd/user/xmodmap@.service
deleted file mode 100644
index 4ef26cf..0000000
--- a/lain/.config/systemd/user/xmodmap@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Merge user xmodmap on x11 display %i
-Documentation=man:xmodmap(1)
-After=x11@%i.target
-Requisite=x11@%i.target
-
-[Service]
-Environment=DISPLAY=:%i
-
-Type=oneshot
-ExecStart=-/usr/bin/env xmodmap %E/X11/modmap
-SyslogIdentifier=xmodmap
-
-[Install]
-WantedBy=x11@%i.target
diff --git a/lain/.config/systemd/user/xresources@.service b/lain/.config/systemd/user/xresources@.service
deleted file mode 100644
index 2b8c9e7..0000000
--- a/lain/.config/systemd/user/xresources@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Merge user xrdb on x11 display %i
-Documentation=man:xrdb(1)
-Before=x11@%i.target
-Requisite=x11@%i.target
-
-[Service]
-Environment=DISPLAY=:%i
-
-Type=oneshot
-ExecStart=/usr/bin/env flock %t/x11-xrdb@%i -c 'xrdb -merge %E/X11/resources'
-SyslogIdentifier=xrdb
-
-[Install]
-WantedBy=x11@%i.target
diff --git a/lain/.config/x11/modmap b/lain/.config/x11/modmap
deleted file mode 100644
index 72c4957..0000000
--- a/lain/.config/x11/modmap
+++ /dev/null
@@ -1,5 +0,0 @@
-! Swap caps lock and escape
-remove Lock = Caps_Lock
-keysym Escape = Caps_Lock
-keysym Caps_Lock = Escape
-add Lock = Caps_Lock
diff --git a/lain/.config/xkb/map.xkb b/lain/.config/xkb/map.xkb
new file mode 100644
index 0000000..783e446
--- /dev/null
+++ b/lain/.config/xkb/map.xkb
@@ -0,0 +1,7 @@
+xkb_keymap {
+	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+	xkb_types     { include "complete"	};
+	xkb_compat    { include "complete"	};
+	xkb_symbols   { include "pc+us+inet(evdev)+altwin(swap_alt_win)+capslock(swapescape)"	};
+	xkb_geometry  { include "pc(pc105)"	};
+};
diff --git a/packages.yml b/packages.yml
index 1aac600..8583c95 100644
--- a/packages.yml
+++ b/packages.yml
@@ -1,7 +1,7 @@
 Base:
   - fish:
       config:
-        - .config/fish/config.fish
+        - .config/fish
         - .bashrc
 
 Command Line Tools:
@@ -29,22 +29,19 @@ Editors:
   - neovim
 
 Window Manager:
-  - x:
+  - x11:
       source: none
       config:
         - .xinitrc
         - .xserverrc
         - .bash_profile
-        - .config/x11/modmap
-      userunit:
-        - x11@.target
-        - xmodmap@.service
-        - xresources@.service
+      userunit: x11@.target
+  - xorg-xkbcomp:
+      alias: xkb
+      source: none
   - i3-gaps:
       alias: i3
       source: aur
-      config: .config/i3/config.ppi3
-      userunit: i3@.service
   - ppi3-git:
       source: aur
   - compton
@@ -57,8 +54,6 @@ Window Manager:
 Desktop Tools:
   - python-pywal:
       alias: wal
-      script: wal.fish
-      config: .config/wal
       userunit:
         - wallpaper.service
         - wallpaper.timer
diff --git a/scripts/xkb.fish b/scripts/xkb.fish
new file mode 100755
index 0000000..ca6881e
--- /dev/null
+++ b/scripts/xkb.fish
@@ -0,0 +1 @@
+xkbcomp ~/.config/xkb/map.xkb ~/.config/xkb/map.xkm