From 0fdecc3f5ad79461bda908acbd3bff455ac1a10c Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 16 May 2020 11:47:51 +0200
Subject: [PATCH] Little changes
---
xmonad.hs | 52 +++++++++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/xmonad.hs b/xmonad.hs
index fb98077..9de8175 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -35,6 +35,8 @@ import XMonad.Util.Run
import XMonad.Util.EZConfig (additionalKeys)
import XMonad.Util.NamedWindows
import XMonad.Util.Loggers
+import XMonad.Util.Scratchpad
+import XMonad.Util.WorkspaceCompare
-- Hooks
import XMonad.Hooks.ICCCMFocus
@@ -44,6 +46,7 @@ import XMonad.Hooks.ManageHelpers
import XMonad.Hooks.UrgencyHook
import XMonad.Hooks.SetWMName
import XMonad.Hooks.EwmhDesktops (ewmh)
+import XMonad.Hooks.DebugStack
-- Prompts
import XMonad.Prompt
@@ -80,7 +83,7 @@ main = do
, normalBorderColor = "#002b36"
, terminal = myTerm
, workspaces = ["#"]
- , manageHook = manageHook defaultConfig <+> myManageHook <+> manageDocks
+ , manageHook = manageHook defaultConfig <+> myManageHook <+> manageDocks <+> namedScratchpadManageHook myScratchPads
, startupHook = docksStartupHook <+> setWMName "LG3D" <+> myStartupHook
, handleEventHook = docksEventHook
, layoutHook = myLayoutHook
@@ -92,13 +95,13 @@ main = do
, ppTitle = xmobarColor "#c678dd" "" . shorten 50
, ppLayout = xmobarColor "#b58900" "" . (Prelude.map toLower)
, ppSep = " "
- , ppWsSep = ""
- , ppCurrent = xmobarColor "#268bd2" "" . wrap "[" "]" . (Prelude.map toUpper)
- , ppVisible = xmobarColor "grey" "" . (\ x -> " " ++ x ++ " ") . (Prelude.map toUpper)
- , ppHidden = xmobarColor "grey" "" . (\ x -> " " ++ x ++ " ") . (Prelude.map toUpper)
- , ppHiddenNoWindows = xmobarColor "#707070" "" . (\ x -> " " ++ x ++ " ") . (Prelude.map toUpper)
- , ppUrgent = xmobarColor "white" "#268bd2" . (\ x -> " " ++ x ++ " ") . (Prelude.map toUpper)
- , ppVisibleNoWindows = Just (xmobarColor "#707070" "" . (\ x -> " " ++ x ++ " ") . (Prelude.map toUpper))
+ , ppWsSep = " "
+ , ppCurrent = xmobarColor "#268bd2" "" . wrap "[" "]" . (Prelude.map toUpper)
+ , ppVisible = xmobarColor "grey" "" . (\ x -> x) . (Prelude.map toUpper)
+ , ppHidden = xmobarColor "grey" "" . (\ x -> x) . (Prelude.map toUpper)
+ , ppHiddenNoWindows = xmobarColor "#707070" "" . (\ x -> x) . (Prelude.map toUpper)
+ , ppUrgent = xmobarColor "white" "#268bd2" . (\ x -> x) . (Prelude.map toUpper)
+ , ppVisibleNoWindows = Just (xmobarColor "#707070" "" . (\ x -> x) . (Prelude.map toUpper))
, ppOrder = \(ws:layout:title:extra) -> [ws, "(" ++ layout ++ ")"] ++ extra ++ [ " " ++ title ]
}
} `additionalKeys` myAdditionalKeys
@@ -130,13 +133,11 @@ myManageHook = do
, manageDocks
]
-myTerm = "/home/kubat/.local/bin/st.sh"
-myOtherTerm = "/home/kubat/.local/bin/alac.sh"
-
+nonNSP = WSIs (return (\ws -> W.tag ws /= "nsp" && isJust (W.stack ws)))
+myTerm = "st"
myXPConfig = def { font = "xft:SourceCodePro:size=9" , bgColor = "black" , position = Top }
data LibNotifyUrgencyHook = LibNotifyUrgencyHook deriving (Read, Show)
-
instance UrgencyHook LibNotifyUrgencyHook where
urgencyHook LibNotifyUrgencyHook w = do
name <- getName w
@@ -159,7 +160,6 @@ mySelectDisplay "l1280" = spawn "/home/kubat/.screenlayout/lateral_1280.sh"
myAdditionalKeys =
[ ((mod4Mask, xK_Return), spawn myTerm)
- , ((mod4Mask .|. shiftMask, xK_Return), spawn myOtherTerm)
-- Apps
, ((mod4Mask, xK_a), submap . M.fromList $
@@ -202,8 +202,8 @@ myAdditionalKeys =
, ((mod4Mask .|. shiftMask, xK_Tab), focusDown)
, ((mod4Mask .|. controlMask, xK_space), withFocused $ windows . W.sink)
- , ((mod4Mask, xK_comma), moveTo Prev HiddenWS)
- , ((mod4Mask, xK_period), moveTo Next HiddenWS)
+ , ((mod4Mask, xK_comma), moveTo Prev HiddenWS)
+ , ((mod4Mask, xK_period), moveTo Next HiddenWS)
, ((mod4Mask .|. shiftMask, xK_comma), shiftTo Prev HiddenWS)
, ((mod4Mask .|. shiftMask, xK_period), shiftTo Next HiddenWS)
, ((mod4Mask, xK_slash), focusMaster)
@@ -270,4 +270,26 @@ myAdditionalKeys =
, ((mod4Mask, xK_F6), spawn "lux -a 10%")
, ((mod4Mask, xK_F3), spawn "asus-kbd-backlight down")
, ((mod4Mask, xK_F4), spawn "asus-kbd-backlight up")
+
+ -- Scratchpads
+ -- namedScratchpadAction myScratchPads "the_name"
+ , ((mod4Mask, xK_x), submap . M.fromList $
+ [ ((0, xK_Return), namedScratchpadAction myScratchPads "terminal")
+ ])
]
+
+--------------------
+-- My scratchpads --
+--------------------
+
+myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
+ ]
+ where
+ spawnTerm = "st -c scratchpad"
+ findTerm = className =? "scratchpad"
+ manageTerm = customFloating $ W.RationalRect l t w h
+ where
+ h = 0.9
+ w = 0.9
+ t = 0.95 -h
+ l = 0.95 -w
--
GitLab