From e2e466e4ac94e1d0c5d4ba0d4f6e4d56ebca2c5c Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sat, 22 May 2021 19:42:37 -0400
Subject: Add dswitcher and cleanup xmonad a bit

---
 lib/xmonad.hs       | 12 ++++--------
 profiles/laptop.nix |  5 +++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/xmonad.hs b/lib/xmonad.hs
index 7fcff32..945cdac 100644
--- a/lib/xmonad.hs
+++ b/lib/xmonad.hs
@@ -64,9 +64,6 @@ getColorsFromXtheme =
       "dark" -> return darkTheme
       _ -> return darkTheme
 
-nixBin :: String
-nixBin = "/home/ben/.nix-profile/bin/"
-
 altMask :: KeyMask
 altMask = mod1Mask
 
@@ -76,19 +73,18 @@ dimmer = "brightnessctl s 5%-"
 
 insKeys :: XConfig l -> [((KeyMask, KeySym), X ())]
 insKeys conf@(XConfig {modMask = modMask}) =
-  [ ((modMask, xK_y), spawn $ nixBin <> "passmenu"),
+  [ ((modMask, xK_y), spawn "passmenu"),
     ((modMask, xK_m), spawn "cmdtree"),
     ((modMask, xK_o), spawn "cmdtree"),
+    ((modMask, xK_n), spawn "dswitcher"),
 
     -- restart xmonad and display stuff via home-manager
     ( (modMask, xK_r),
       spawn $
         intercalate
           " && "
-          [ "$HOME/.nix-profile/bin/xmonad --recompile",
-            "$HOME/.nix-profile/bin/xmonad --restart",
-            "$HOME/.nix-profile/bin/xlayoutdisplay",
-            "$HOME/bin/uctl restart polybar"
+          [ "xlayoutdisplay",
+            "uctl restart polybar"
           ]
     ),
 
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index 3ecee50..e8bdbba 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -5,4 +5,9 @@
   imports = [
     ../lib/linux.nix
   ];
+  home = {
+    packages = [
+      pkgs.wmctrl
+    ];
+  };
 }
-- 
cgit v1.2.3