Fix up x11 keyboard layout and clean packages.yml

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

lain/.config/systemd/user/xmodmap@.service

@@ -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

lain/.config/systemd/user/xresources@.service

@@ -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

lain/.config/x11/modmap

@@ -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

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)"	};
+};

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

scripts/xkb.fish

@@ -0,0 +1 @@
+xkbcomp ~/.config/xkb/map.xkb ~/.config/xkb/map.xkm