l: clean up xmonad config
This commit is contained in:
parent
99b8bfeaec
commit
c53e97a024
@ -78,12 +78,7 @@ let
|
|||||||
|
|
||||||
# XXX JSON is close enough :)
|
# XXX JSON is close enough :)
|
||||||
XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
|
XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
|
||||||
"cr"
|
"dashboard"
|
||||||
"gm"
|
|
||||||
"ff"
|
|
||||||
"IM"
|
|
||||||
"mail"
|
|
||||||
"stockholm"
|
|
||||||
]);
|
]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,48 +5,31 @@
|
|||||||
|
|
||||||
|
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import Control.Exception
|
|
||||||
import Text.Read (readEither)
|
|
||||||
import XMonad
|
import XMonad
|
||||||
import System.IO (hPutStrLn, stderr)
|
|
||||||
import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
|
|
||||||
import System.Posix.Process (executeFile)
|
|
||||||
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
|
|
||||||
, removeEmptyWorkspace)
|
|
||||||
import XMonad.Actions.GridSelect
|
|
||||||
import XMonad.Actions.CycleWS (toggleWS)
|
|
||||||
--import XMonad.Actions.CopyWindow ( copy )
|
|
||||||
import XMonad.Layout.NoBorders ( smartBorders )
|
|
||||||
import qualified XMonad.StackSet as W
|
import qualified XMonad.StackSet as W
|
||||||
import Data.Map (Map)
|
import Control.Exception
|
||||||
import qualified Data.Map as Map
|
import Data.List (isInfixOf)
|
||||||
-- TODO import XMonad.Layout.WorkspaceDir
|
import System.Environment (getArgs, withArgs, getEnv)
|
||||||
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
|
import System.IO (hPutStrLn, stderr)
|
||||||
-- import XMonad.Layout.Tabbed
|
import Text.Read (readEither)
|
||||||
--import XMonad.Layout.MouseResizableTile
|
|
||||||
import XMonad.Layout.Reflect (reflectVert)
|
|
||||||
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
|
||||||
import XMonad.Hooks.Place (placeHook, smart)
|
|
||||||
import XMonad.Hooks.FloatNext (floatNextHook)
|
|
||||||
import XMonad.Actions.PerWorkspaceKeys (chooseAction)
|
|
||||||
import XMonad.Layout.PerWorkspace (onWorkspace)
|
|
||||||
--import XMonad.Layout.BinarySpacePartition
|
|
||||||
import XMonad.Util.EZConfig (additionalKeysP)
|
|
||||||
|
|
||||||
import XMonad.Prompt (autoComplete, defaultXPConfig, XPConfig, mkXPrompt)
|
|
||||||
import XMonad.Hooks.UrgencyHook (focusUrgent, withUrgencyHook, urgencyBorderColor, BorderUrgencyHook(BorderUrgencyHook))
|
|
||||||
import XMonad.Actions.DynamicWorkspaces (addWorkspacePrompt, removeEmptyWorkspace, renameWorkspace, withWorkspace)
|
|
||||||
import XMonad.Hooks.FloatNext (floatNext, floatNextHook)
|
|
||||||
import XMonad.Prompt.Workspace
|
|
||||||
import XMonad.Actions.CopyWindow (copy, kill1)
|
import XMonad.Actions.CopyWindow (copy, kill1)
|
||||||
import qualified Data.Map as M
|
import XMonad.Actions.CycleWS (toggleWS)
|
||||||
import XMonad.Hooks.ManageDocks (avoidStruts, manageDocks, ToggleStruts(ToggleStruts))
|
import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace, removeEmptyWorkspace)
|
||||||
|
import XMonad.Actions.DynamicWorkspaces (withWorkspace)
|
||||||
--import XMonad.Actions.Submap
|
import XMonad.Actions.GridSelect (GSConfig(..), gridselectWorkspace, navNSearch)
|
||||||
import XMonad.Stockholm.Pager
|
import XMonad.Hooks.FloatNext (floatNext)
|
||||||
import XMonad.Stockholm.Rhombus
|
import XMonad.Hooks.FloatNext (floatNextHook)
|
||||||
import XMonad.Stockholm.Shutdown
|
import XMonad.Hooks.ManageDocks (avoidStruts, ToggleStruts(ToggleStruts))
|
||||||
|
import XMonad.Hooks.Place (placeHook, smart)
|
||||||
|
import XMonad.Hooks.UrgencyHook (focusUrgent)
|
||||||
|
import XMonad.Hooks.UrgencyHook (SpawnUrgencyHook(..), withUrgencyHook)
|
||||||
|
import XMonad.Layout.FixedColumn (FixedColumn(..))
|
||||||
|
import XMonad.Layout.NoBorders ( smartBorders )
|
||||||
|
import XMonad.Prompt (autoComplete, searchPredicate, XPConfig)
|
||||||
|
import XMonad.Prompt.Window (windowPromptGoto, windowPromptBringCopy)
|
||||||
|
import XMonad.Stockholm.Shutdown (sendShutdownEvent, handleShutdownEvent)
|
||||||
|
import XMonad.Util.EZConfig (additionalKeysP)
|
||||||
|
|
||||||
|
|
||||||
myTerm :: String
|
myTerm :: String
|
||||||
@ -67,18 +50,12 @@ mainNoArgs :: IO ()
|
|||||||
mainNoArgs = do
|
mainNoArgs = do
|
||||||
workspaces0 <- getWorkspaces0
|
workspaces0 <- getWorkspaces0
|
||||||
xmonad'
|
xmonad'
|
||||||
-- $ withUrgencyHookC dzenUrgencyHook { args = ["-bg", "magenta", "-fg", "magenta", "-h", "2"], duration = 500000 }
|
|
||||||
-- urgencyConfig { remindWhen = Every 1 }
|
|
||||||
-- $ withUrgencyHook borderUrgencyHook "magenta"
|
|
||||||
-- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never }
|
|
||||||
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
$ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
|
||||||
$ def
|
$ def
|
||||||
{ terminal = myTerm
|
{ terminal = myTerm
|
||||||
, modMask = mod4Mask
|
, modMask = mod4Mask
|
||||||
, workspaces = workspaces0
|
, workspaces = workspaces0
|
||||||
, layoutHook = smartBorders $ myLayoutHook
|
, layoutHook = smartBorders $ myLayoutHook
|
||||||
-- , handleEventHook = myHandleEventHooks <+> handleTimerEvent
|
|
||||||
--, handleEventHook = handleTimerEvent
|
|
||||||
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
, manageHook = placeHook (smart (1,0)) <+> floatNextHook
|
||||||
, startupHook = spawn "echo emit XMonadStartup"
|
, startupHook = spawn "echo emit XMonadStartup"
|
||||||
, normalBorderColor = "#1c1c1c"
|
, normalBorderColor = "#1c1c1c"
|
||||||
@ -118,19 +95,19 @@ displaySomeException :: SomeException -> String
|
|||||||
displaySomeException = displayException
|
displaySomeException = displayException
|
||||||
|
|
||||||
|
|
||||||
|
myKeyMap :: [([Char], X ())]
|
||||||
myKeyMap =
|
myKeyMap =
|
||||||
[ ("M4-<F11>", spawn "i3lock -i /tmp/wallpaper.png -f")
|
[ ("M4-<F11>", spawn "i3lock -i /tmp/wallpaper.png -f")
|
||||||
, ("M4-p", spawn "passmenu --type")
|
, ("M4-p", spawn "passmenu --type")
|
||||||
--, ("M4-r", spawn "exe=$(yeganesh -x) && eval \"exec $exe\"")
|
|
||||||
, ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")
|
, ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")
|
||||||
, ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%")
|
, ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%")
|
||||||
, ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle")
|
, ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle")
|
||||||
, ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle")
|
, ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle")
|
||||||
, ("<XF86Launch1>", gridselectWorkspace myWSConfig W.view)
|
, ("<XF86Launch1>", gridselectWorkspace gridConfig W.view)
|
||||||
|
|
||||||
, ("M4-a", focusUrgent)
|
, ("M4-a", focusUrgent)
|
||||||
, ("M4-S-r", renameWorkspace defaultXPConfig)
|
, ("M4-S-r", renameWorkspace def)
|
||||||
, ("M4-S-a", addWorkspacePrompt defaultXPConfig)
|
, ("M4-S-a", addWorkspacePrompt def)
|
||||||
, ("M4-S-<Backspace>", removeEmptyWorkspace)
|
, ("M4-S-<Backspace>", removeEmptyWorkspace)
|
||||||
, ("M4-S-c", kill1)
|
, ("M4-S-c", kill1)
|
||||||
, ("M4-<Esc>", toggleWS)
|
, ("M4-<Esc>", toggleWS)
|
||||||
@ -139,66 +116,31 @@ myKeyMap =
|
|||||||
, ("M4-f", floatNext True)
|
, ("M4-f", floatNext True)
|
||||||
, ("M4-b", sendMessage ToggleStruts)
|
, ("M4-b", sendMessage ToggleStruts)
|
||||||
|
|
||||||
, ("M4-v", withWorkspace myXPConfig (windows . W.view))
|
, ("M4-v", withWorkspace autoXPConfig (windows . W.view))
|
||||||
, ("M4-S-v", withWorkspace myXPConfig (windows . W.shift))
|
, ("M4-S-v", withWorkspace autoXPConfig (windows . W.shift))
|
||||||
, ("M4-C-v", withWorkspace myXPConfig (windows . copy))
|
, ("M4-C-v", withWorkspace autoXPConfig (windows . copy))
|
||||||
|
|
||||||
-- , (_4 , xK_q ) & \k -> (k, goToSelected myCNConfig { gs_navigate = makeGSNav k } )
|
, ("M4-q", windowPromptGoto infixAutoXPConfig)
|
||||||
-- , (_4S, xK_q ) & \k -> (k, bringSelected myCNConfig { gs_navigate = makeGSNav k } )
|
, ("M4-C-q", windowPromptBringCopy infixAutoXPConfig)
|
||||||
-- , (_4C, xK_q ) & \k -> (k, withSelectedWindow ( \a -> get >>= \s -> put s { windowset = copyWindow a (W.tag $ W.workspace $ W.current $ windowset s) (windowset s) } ) myCNConfig { gs_navigate = makeGSNav k } )
|
|
||||||
|
|
||||||
--, ("M4-<F1>", perWorkspaceAction workspaceConfigs)
|
|
||||||
, ("M4-S-q", return ())
|
, ("M4-S-q", return ())
|
||||||
]
|
]
|
||||||
|
|
||||||
myGSConfig = defaultGSConfig
|
autoXPConfig :: XPConfig
|
||||||
{ gs_cellheight = 50
|
autoXPConfig = def
|
||||||
|
{ autoComplete = Just 5000
|
||||||
|
}
|
||||||
|
|
||||||
|
infixAutoXPConfig :: XPConfig
|
||||||
|
infixAutoXPConfig = autoXPConfig
|
||||||
|
{ searchPredicate = isInfixOf
|
||||||
|
}
|
||||||
|
|
||||||
|
gridConfig :: GSConfig WorkspaceId
|
||||||
|
gridConfig = def
|
||||||
|
{ gs_cellwidth = 50
|
||||||
|
, gs_cellheight = 50
|
||||||
, gs_cellpadding = 2
|
, gs_cellpadding = 2
|
||||||
, gs_navigate = navNSearch
|
, gs_navigate = navNSearch
|
||||||
, gs_font = myFont
|
, gs_font = myFont
|
||||||
}
|
}
|
||||||
|
|
||||||
myXPConfig :: XPConfig
|
|
||||||
myXPConfig = defaultXPConfig
|
|
||||||
{ autoComplete = Just 5000
|
|
||||||
}
|
|
||||||
|
|
||||||
myWSConfig = myGSConfig
|
|
||||||
{ gs_cellwidth = 50
|
|
||||||
}
|
|
||||||
|
|
||||||
pagerConfig :: PagerConfig
|
|
||||||
pagerConfig = def
|
|
||||||
{ pc_font = myFont
|
|
||||||
, pc_cellwidth = 64
|
|
||||||
--, pc_cellheight = 36 -- TODO automatically keep screen aspect
|
|
||||||
--, pc_borderwidth = 1
|
|
||||||
--, pc_matchcolor = "#f0b000"
|
|
||||||
, pc_matchmethod = MatchPrefix
|
|
||||||
--, pc_colors = pagerWorkspaceColors
|
|
||||||
, pc_windowColors = windowColors
|
|
||||||
}
|
|
||||||
where
|
|
||||||
windowColors _ _ _ True _ = ("#ef4242","#ff2323")
|
|
||||||
windowColors wsf m c u wf = do
|
|
||||||
let y = defaultWindowColors wsf m c u wf
|
|
||||||
if m == False && wf == True
|
|
||||||
then ("#402020", snd y)
|
|
||||||
else y
|
|
||||||
|
|
||||||
wGSConfig :: GSConfig Window
|
|
||||||
wGSConfig = def
|
|
||||||
{ gs_cellheight = 20
|
|
||||||
, gs_cellwidth = 192
|
|
||||||
, gs_cellpadding = 5
|
|
||||||
, gs_font = myFont
|
|
||||||
, gs_navigate = navNSearch
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
(&) :: a -> (a -> c) -> c
|
|
||||||
(&) = flip ($)
|
|
||||||
|
|
||||||
allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
|
|
||||||
allWorkspaceNames ws =
|
|
||||||
return $ map W.tag (W.hidden ws) ++ [W.tag $ W.workspace $ W.current ws]
|
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
module Util.PerWorkspaceConfig
|
|
||||||
( WorkspaceConfig (..)
|
|
||||||
, WorkspaceConfigs
|
|
||||||
, switchToWorkspace
|
|
||||||
, defaultWorkspaceConfig
|
|
||||||
, perWorkspaceAction
|
|
||||||
, perWorkspaceTermAction
|
|
||||||
-- , myLayoutHack
|
|
||||||
)
|
|
||||||
where
|
|
||||||
|
|
||||||
import XMonad
|
|
||||||
import XMonad.Core (LayoutClass)
|
|
||||||
import Control.Monad (when)
|
|
||||||
|
|
||||||
import qualified Data.Map as M
|
|
||||||
import qualified XMonad.StackSet as W
|
|
||||||
|
|
||||||
data WorkspaceConfig l =
|
|
||||||
WorkspaceConfig
|
|
||||||
{ switchAction :: X ()
|
|
||||||
, startAction :: X ()
|
|
||||||
, keyAction :: X ()
|
|
||||||
, termAction :: X ()
|
|
||||||
}
|
|
||||||
|
|
||||||
type WorkspaceConfigs l = M.Map WorkspaceId (WorkspaceConfig l)
|
|
||||||
|
|
||||||
defaultWorkspaceConfig = WorkspaceConfig
|
|
||||||
{ switchAction = return ()
|
|
||||||
, startAction = return ()
|
|
||||||
, keyAction = return ()
|
|
||||||
, termAction = spawn "urxvtc"
|
|
||||||
}
|
|
||||||
|
|
||||||
whenLookup wsId cfg a =
|
|
||||||
when (M.member wsId cfg) (a $ cfg M.! wsId)
|
|
||||||
|
|
||||||
switchToWorkspace :: WorkspaceConfigs l -> WorkspaceId -> X ()
|
|
||||||
switchToWorkspace cfg wsId = do
|
|
||||||
windows $ W.greedyView wsId
|
|
||||||
wins <- gets (W.integrate' . W.stack . W.workspace . W.current . windowset)
|
|
||||||
when (null wins) $ whenLookup wsId cfg startAction
|
|
||||||
whenLookup wsId cfg switchAction
|
|
||||||
|
|
||||||
perWorkspaceAction :: WorkspaceConfigs l -> X ()
|
|
||||||
perWorkspaceAction cfg = withWindowSet $ \s -> whenLookup (W.currentTag s) cfg keyAction
|
|
||||||
|
|
||||||
perWorkspaceTermAction :: WorkspaceConfigs l -> X ()
|
|
||||||
perWorkspaceTermAction cfg = withWindowSet $ \s -> case M.lookup (W.currentTag s) cfg of
|
|
||||||
Just x -> termAction x
|
|
||||||
_ -> termAction defaultWorkspaceConfig
|
|
Loading…
Reference in New Issue
Block a user