From ad77311c94224fcb039995b2e5941ff399e83c8e Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Tue, 10 Mar 2020 22:04:52 +0000
Subject: [PATCH] Configure keyboard preference with home-manager

Preferring home-manager to reduce some of the clutter I've created.
---
 configs/.Xmodmap                 | 7 -------
 configs/.config/nixpkgs/home.nix | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 configs/.Xmodmap

diff --git a/configs/.Xmodmap b/configs/.Xmodmap
deleted file mode 100644
index 518793b86..000000000
--- a/configs/.Xmodmap
+++ /dev/null
@@ -1,7 +0,0 @@
-! remap caps-lock to escape
-remove Lock = Caps_Lock
-keysym Caps_Lock = Escape
-
-! swap ctrl and super (similar to OSX) -- currently not working
-! remove mod4 = Super_L
-! add control = Super_L
diff --git a/configs/.config/nixpkgs/home.nix b/configs/.config/nixpkgs/home.nix
index 76dce2f21..840483556 100644
--- a/configs/.config/nixpkgs/home.nix
+++ b/configs/.config/nixpkgs/home.nix
@@ -15,6 +15,13 @@
       jq
       pup
     ];
+    keyboard = {
+      options = [
+        # Swap Caps-Lock and Escape
+        "remove Lock = Caps_Lock"
+        "keysym Caps_Lock = Escape"
+      ];
+    };
     sessionVariables = {
     };
     stateVersion = "19.09";