fix window bringer and resolve init conflict

2 files changed, 19 insertions, 8 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 76d431b..696a752 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,4 +1,3 @@
-
 ;; -*- lexical-binding: t; -*-
 
 (progn ; performance stuff:
@@ -796,12 +795,11 @@ changes."
   (push ?\C-u exwm-input-prefix-keys)  ;; send C-u to all windows too
   (push ?\M-L exwm-input-prefix-keys)
   (progn
-    ;; (exwm-wm-mode)
-    ;; (display-time-mode 1)
-    ;; (display-battery-mode 1)
-    ;; (ednc-mode 1)
+    ;; (exwm-enable)
     ;; (exwm-randr-mode)
+    ;; (ednc-mode 1)
     ;; (exwm-systemtray-mode)
+    ;; (add-hook 'after-init-hook #'exwm-randr-refresh)
     )
   :hook
   (exwm-update-class . my/exwm-set-buffer-name)
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 2fab902..77dc3be 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -5,6 +5,8 @@ import System.Exit
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M
 
+import XMonad.Util.NamedWindows (getName)
+
 import Graphics.X11.ExtraTypes.XF86 (xF86XK_AudioMute,
                                      xF86XK_AudioLowerVolume,
                                      xF86XK_AudioRaiseVolume,
@@ -24,6 +26,17 @@ import XMonad.Layout.Minimize (minimize)
 import XMonad.Layout.ResizableThreeColumns
 import qualified XMonad.Layout.BoringWindows as BW
 
+myBringerConfig :: WindowBringerConfig
+myBringerConfig = WindowBringerConfig
+  { menuCommand = "dmenu"
+  , menuArgs = ["-i"]
+  , windowTitler = decorateName
+  , windowFilter = \_ -> return True
+  }
+  where decorateName ws w = do
+          name <- show <$> getName w
+          return $ name ++ " [" ++ W.tag ws ++ "]"
+
 myTerminal      = "urxvt"
 myBrowser       = "glide"
 myLauncher      = "dmenu_run"
@@ -56,8 +69,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     , ((noModMask         , xF86XK_MonBrightnessDown), spawn myBrightnessDown)
     , ((noModMask         , xF86XK_MonBrightnessUp), spawn myBrightnessUp)
     
-    , ((modm .|. shiftMask, xK_g     ), gotoMenu)
-    , ((modm .|. shiftMask, xK_b     ), bringMenu)
+    , ((modm .|. shiftMask, xK_g     ), gotoMenuConfig myBringerConfig)
+    , ((modm .|. shiftMask, xK_b     ), bringMenuConfig myBringerConfig)
   
     , ((modm .|. shiftMask, xK_c     ), kill)
 
@@ -134,7 +147,7 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList
 
 ------------------------------------------------------------------------
 -- Layouts:
-myLayout = smartBorders tiled ||| smartBorders threeCol ||| smartBorders Full
+myLayout = smartBorders Full ||| smartBorders threeCol ||| smartBorders tiled
   where
      threeCol = ResizableThreeCol nmaster delta (1/3) []
      tiled   = Tall nmaster delta (3/5)