nits

2 files changed, 16 insertions, 11 deletions

diff --git a/xmobars.sh b/xmobars.sh
index 280d597..55415ef 100755
--- a/xmobars.sh
+++ b/xmobars.sh
@@ -16,5 +16,5 @@ trayer --margin 2 --distancefrom left \
        --transparent true \
        --alpha $alpha --padding 1 &
 
-killall xmobar-exwm
-xmobar-exwm $* &
+killall xmobar-single
+xmobar-single $* &
diff --git a/xmonad.hs b/xmonad.hs
index b041c79..b9d98e3 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -5,7 +5,7 @@ import System.Environment (lookupEnv)
 
 import XMonad hiding ( (|||) )
 import XMonad.Actions.FloatKeys (keysMoveWindow, keysResizeWindow)
-import XMonad.Actions.WindowGo (raise, runOrRaise, raiseMaybe)
+import XMonad.Actions.WindowGo (raise, runOrRaise) -- raiseMaybe
 import qualified XMonad.Actions.GridSelect as GS
 import qualified XMonad.Actions.CycleWS as CWS
 import XMonad.Actions.PerWindowKeys (bindFirst)
@@ -18,16 +18,17 @@ import qualified XMonad.Hooks.StatusBar.PP as SBP
 import qualified XMonad.Hooks.EwmhDesktops as Ewm
 import qualified XMonad.Hooks.UrgencyHook as U
 import qualified XMonad.Layout.NoBorders as NB
-import XMonad.Layout.IM (withIM, Property(ClassName))
+-- import XMonad.Layout.IM (withIM, Property(ClassName))
 import XMonad.Layout.LayoutCombinators ((|||))
 import qualified XMonad.Layout.LayoutCombinators as LJ
 import qualified XMonad.Layout.Renamed as LR
 import qualified XMonad.Layout.Spacing as SP
-import qualified XMonad.Layout.Reflect as Refl
+-- import qualified XMonad.Layout.Reflect as Refl
 import qualified XMonad.Layout.PerWorkspace as PW
 import qualified XMonad.Prompt as P
 import qualified XMonad.Prompt.Shell as PS
 import qualified XMonad.Prompt.XMonad as XmP
+import qualified XMonad.Prompt.Window as PW
 import qualified XMonad.StackSet as W
 import qualified XMonad.Util.EZConfig as EZ
 import qualified XMonad.Util.Hacks as UH
@@ -102,7 +103,7 @@ isMusic = className =? "Tidal"
 
 runOrRaiseFirefox = runOrRaise "firefox" $ className =? "Firefox"
 
-runOrRiseMusic = raiseMaybe (spawn openMusicWindow) isMusic
+-- runOrRiseMusic = raiseMaybe (spawn openMusicWindow) isMusic
 
 toggleEmacs other = do
   ems <- mapM (WP.focusedHasProperty . WP.ClassName) ["Emacs"]
@@ -145,7 +146,7 @@ keyDefs conf =
   , ("M-C-<Down>", resize (0,10) (0,0))
   , ("M-a", scratch "aptitude")
   , ("M-b", sendMessage $ MD.ToggleStruts)
-  , ("M-S-d", scratch "tidal-hifi")
+  , ("M-S-d", scratch "tidal")
   , ("M-d", toggleEmacs $ windows (W.greedyView "D"))
   , ("M-e", toggleEmacs runOrRaiseFirefox)
   , ("M-C-e", spawn "emacsclient -c")
@@ -165,10 +166,14 @@ keyDefs conf =
   , ("M-x M-f", withFocused float)
   , ("M-x s", withFocused $ windows . W.sink)
   , ("M-x g", GS.goToSelected GS.def)
+  , ("M-x S-g", GS.bringSelected GS.def)
   , ("M-x f", jumpToL "F")
   , ("M-x l", jumpToLE "L")
   , ("M-x r", jumpToLE "R")
   , ("M-x t", jumpToLE "T")
+  , ("M-x w", PW.windowPrompt
+                 conf { P.autoComplete = Just 500000 }
+                 PW.Bring PW.allWindows)
   , ("M-x n", sendMessage NextLayout)
   , ("M-S-x", XmP.xmonadPrompt $ conf {P.position = P.Top})
   , ("M-z l", xdgscr "activate")
@@ -198,9 +203,9 @@ layouts = PW.onWorkspace "D" lytTall lytFullTall
     namedLyt n = LR.renamed [LR.Replace n]
     lytFull = namedLyt "F" Full
     lytTall = namedLyt "T" $ spacing 1 (Tall 1 (1/100) (1/2))
-    lytLeft = namedLyt "L" $ withIM (11/26) (ClassName "Zathura") Full
-    lytRight = namedLyt "R" $ Refl.reflectHoriz lytLeft
-    emacsLyts = lytLeft ||| lytRight ||| lytFullTall
+    -- lytLeft = namedLyt "L" $ withIM (11/26) (ClassName "Zathura") Full
+    -- lytRight = namedLyt "R" $ Refl.reflectHoriz lytLeft
+    -- emacsLyts = lytLeft ||| lytRight ||| lytFullTall
     lytFullTall = lytFull ||| lytTall
 
 scratchpads =
@@ -255,7 +260,7 @@ main = do
     , borderWidth = 1
     , focusedBorderColor = defFBorder
     , normalBorderColor = defBorder
-    , terminal = (jaoscript "term")
+    , terminal = "kitty"
     , workspaces = defWorkspaces
     , focusFollowsMouse = False
     } `EZ.removeKeysP` ["M-j", "M-n", "M-w", "M-m", "M-r", "M-p", "M-<Space>"]