From c8c960726925f2b35d382d3fe244c15c22682b64 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 16 Apr 2019 13:03:18 -0700
Subject: add cmdtree

---
 cmdtree      |  2 +-
 packages.nix |  5 ++++-
 xmonad.hs    | 10 ++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmdtree b/cmdtree
index 5606078..411a4a0 160000
--- a/cmdtree
+++ b/cmdtree
@@ -1 +1 @@
-Subproject commit 5606078e8fa02462f0208d9f9cad98c7673812e6
+Subproject commit 411a4a0853c81b6c4417d21099d9de0b919d4c88
diff --git a/packages.nix b/packages.nix
index 8999645..89f12f1 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,10 +1,13 @@
 { pkgs }:
 
 with pkgs;
-
+let
+  cmdtree = import ./cmdtree { nixpkgs = pkgs; };
+in
 [
 ag
 cloc
+cmdtree
 dict
 dmenu
 entr
diff --git a/xmonad.hs b/xmonad.hs
index 4b8778e..05d3402 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -65,14 +65,8 @@ altMask = mod1Mask
 insKeys :: XConfig l -> [((KeyMask, KeySym), X ())]
 insKeys conf@(XConfig {modMask = modMask}) =
   [ ((modMask, xK_y), spawn $ nixBin <> "passmenu")
-  -- ((modMask, xK_u), _) -- reserved for cmdtree
-  , ((modMask, xK_i), spawn $ nixBin <> "rofi -sidebar-mode -show window")
-  , ((modMask, xK_o), spawn $ "rofi -sidebar-mode -show run")
-
-  , ((modMask, xK_m), spawn "seeme")
-  , ((modMask, xK_e), spawn "emacsclient -c")
-
-  , ((modMask .|. altMask, xK_h), spawn "home-manager switch")
+  , ((modMask, xK_m), spawn "cmdtree")
+  , ((modMask, xK_o), spawn "cmdtree")
 
   -- sticky windows
   , ((modMask, xK_a ), windows copyToAll) -- @@ Make focused window always visible
-- 
cgit v1.2.3