mirror of
https://codeberg.org/frosty/xmonad.hs.git
synced 2024-09-19 03:36:45 -04:00
remove unused imports, hide borders for non-floating windows, and update script references
This commit is contained in:
parent
f63123528c
commit
13d671d7fd
48
xmonad.hs
48
xmonad.hs
|
@ -7,21 +7,16 @@ import System.Exit
|
||||||
import Text.Printf
|
import Text.Printf
|
||||||
import XMonad
|
import XMonad
|
||||||
import XMonad.Actions.CycleWS
|
import XMonad.Actions.CycleWS
|
||||||
import XMonad.Actions.Submap
|
|
||||||
import XMonad.Actions.ToggleFullFloat
|
import XMonad.Actions.ToggleFullFloat
|
||||||
import XMonad.Hooks.DynamicLog
|
import XMonad.Hooks.DynamicLog
|
||||||
import XMonad.Hooks.EwmhDesktops
|
import XMonad.Hooks.EwmhDesktops
|
||||||
import XMonad.Hooks.InsertPosition
|
import XMonad.Hooks.InsertPosition
|
||||||
import XMonad.Hooks.ManageDocks (ToggleStruts (..), avoidStruts, manageDocks)
|
import XMonad.Hooks.ManageDocks (ToggleStruts (..), avoidStruts, manageDocks)
|
||||||
import XMonad.Hooks.Place
|
|
||||||
import XMonad.Hooks.StatusBar
|
import XMonad.Hooks.StatusBar
|
||||||
import XMonad.Hooks.WindowSwallowing
|
import XMonad.Hooks.WindowSwallowing
|
||||||
import XMonad.Layout.Grid
|
|
||||||
import XMonad.Layout.NoBorders
|
import XMonad.Layout.NoBorders
|
||||||
import XMonad.Layout.Renamed (named)
|
import XMonad.Layout.Renamed (named)
|
||||||
import XMonad.Layout.Spacing
|
|
||||||
import XMonad.StackSet qualified as W
|
import XMonad.StackSet qualified as W
|
||||||
import XMonad.Util.NamedScratchpad
|
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main =
|
main =
|
||||||
|
@ -64,21 +59,19 @@ myKeys (XConfig {XMonad.modMask = modMask, XMonad.workspaces = workspaces}) =
|
||||||
((modMask .|. controlMask, xK_w), spawn "wallpapers-open"),
|
((modMask .|. controlMask, xK_w), spawn "wallpapers-open"),
|
||||||
((modMask .|. controlMask, xK_d), spawn "arandr"),
|
((modMask .|. controlMask, xK_d), spawn "arandr"),
|
||||||
-- Screenshotting
|
-- Screenshotting
|
||||||
((0, xK_Print), spawn "epicshot -cs select"),
|
((0, xK_Print), spawn "screenshot -cs select"),
|
||||||
((controlMask, xK_Print), spawn "epicshot -cs full"),
|
((controlMask, xK_Print), spawn "screenshot -cs full"),
|
||||||
((modMask, xK_Print), spawn "epicshot -so select"),
|
((modMask .|. controlMask, xK_r), spawn "screenshot -cs select"),
|
||||||
((modMask .|. controlMask, xK_r), spawn "epicshot -cs select"),
|
((modMask .|. controlMask, xK_t), spawn "screenshot -cs full"),
|
||||||
((modMask .|. controlMask, xK_t), spawn "epicshot -cs full"),
|
|
||||||
((modMask .|. controlMask, xK_g), spawn "epicshot -so select"),
|
|
||||||
-- Faux function row
|
-- Faux function row
|
||||||
((modMask .|. controlMask, xK_F5), spawn "mpc prev"),
|
((modMask .|. controlMask, xK_F5), spawn "mpc prev"),
|
||||||
((modMask .|. controlMask, xK_F6), spawn "mpc next"),
|
((modMask .|. controlMask, xK_F6), spawn "mpc next"),
|
||||||
((modMask .|. controlMask, xK_F7), spawn "mpc toggle"),
|
((modMask .|. controlMask, xK_F7), spawn "mpc toggle"),
|
||||||
((modMask .|. controlMask, xK_F8), spawn "mpc stop"),
|
((modMask .|. controlMask, xK_F8), spawn "mpc stop"),
|
||||||
((modMask .|. controlMask, xK_F9), spawn "volctrl toggle"),
|
((modMask .|. controlMask, xK_F9), spawn "volumectrl toggle"),
|
||||||
((modMask .|. controlMask, xK_F10), spawn "volctrl 5%-"),
|
((modMask .|. controlMask, xK_F10), spawn "volumectrl 5%-"),
|
||||||
((modMask .|. controlMask, xK_F11), spawn "volctrl 5%+"),
|
((modMask .|. controlMask, xK_F11), spawn "volumectrl 5%+"),
|
||||||
((modMask .|. controlMask, xK_F12), spawn "xscreensaver-command -l"),
|
((modMask .|. controlMask, xK_F12), spawn "xidlehook-client --socket $XIDLEHOOK_SOCK control --action trigger --timer 1"),
|
||||||
-- Special keys
|
-- Special keys
|
||||||
((0, xF86XK_Explorer), spawnTerminal "nnn"),
|
((0, xF86XK_Explorer), spawnTerminal "nnn"),
|
||||||
((0, xF86XK_Search), spawnDmenu "dmenu_run"),
|
((0, xF86XK_Search), spawnDmenu "dmenu_run"),
|
||||||
|
@ -88,9 +81,9 @@ myKeys (XConfig {XMonad.modMask = modMask, XMonad.workspaces = workspaces}) =
|
||||||
((0, xF86XK_AudioNext), spawn "mpc next"),
|
((0, xF86XK_AudioNext), spawn "mpc next"),
|
||||||
((0, xF86XK_AudioPlay), spawn "mpc toggle"),
|
((0, xF86XK_AudioPlay), spawn "mpc toggle"),
|
||||||
((0, xF86XK_AudioStop), spawn "mpc stop"),
|
((0, xF86XK_AudioStop), spawn "mpc stop"),
|
||||||
((0, xF86XK_AudioMute), spawn "volctrl toggle"),
|
((0, xF86XK_AudioMute), spawn "volumectrl toggle"),
|
||||||
((0, xF86XK_AudioLowerVolume), spawn "volctrl 5%-"),
|
((0, xF86XK_AudioLowerVolume), spawn "volumectrl 5%-"),
|
||||||
((0, xF86XK_AudioRaiseVolume), spawn "volctrl 5%+"),
|
((0, xF86XK_AudioRaiseVolume), spawn "volumectrl 5%+"),
|
||||||
-- Layout management
|
-- Layout management
|
||||||
((modMask, xK_Tab), sendMessage NextLayout),
|
((modMask, xK_Tab), sendMessage NextLayout),
|
||||||
((modMask, xK_b), sendMessage ToggleStruts),
|
((modMask, xK_b), sendMessage ToggleStruts),
|
||||||
|
@ -111,7 +104,7 @@ myKeys (XConfig {XMonad.modMask = modMask, XMonad.workspaces = workspaces}) =
|
||||||
((modMask .|. shiftMask, xK_f), withFocused toggleFullFloat),
|
((modMask .|. shiftMask, xK_f), withFocused toggleFullFloat),
|
||||||
((modMask .|. shiftMask, xK_space), withFocused toggleFloat),
|
((modMask .|. shiftMask, xK_space), withFocused toggleFloat),
|
||||||
-- Session
|
-- Session
|
||||||
((modMask .|. controlMask, xK_l), spawn "xscreensaver-command -l"),
|
((modMask .|. controlMask, xK_l), spawn "xidlehook-client --socket $XIDLEHOOK_SOCK control --action trigger --timer 1"),
|
||||||
((modMask .|. controlMask, xK_s), spawn "xmonad --restart && notify-send xmonad 'Successfully recompiled and restarted.'"),
|
((modMask .|. controlMask, xK_s), spawn "xmonad --restart && notify-send xmonad 'Successfully recompiled and restarted.'"),
|
||||||
((modMask .|. controlMask, xK_Delete), io exitSuccess)
|
((modMask .|. controlMask, xK_Delete), io exitSuccess)
|
||||||
]
|
]
|
||||||
|
@ -156,7 +149,7 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) =
|
||||||
]
|
]
|
||||||
|
|
||||||
myLayoutHook =
|
myLayoutHook =
|
||||||
lessBorders OnlyScreenFloat $
|
noBorders $
|
||||||
avoidStruts $
|
avoidStruts $
|
||||||
tall ||| full
|
tall ||| full
|
||||||
where
|
where
|
||||||
|
@ -173,9 +166,17 @@ myManageHook =
|
||||||
composeAll
|
composeAll
|
||||||
[ manageDocks,
|
[ manageDocks,
|
||||||
insertPosition End Newer,
|
insertPosition End Newer,
|
||||||
className =? "Arandr" --> doFloat,
|
title =? "Picture-in-Picture" --> doFloat,
|
||||||
className =? "Nsxiv" --> doFloat
|
liftX isFloating --> hasBorder True
|
||||||
]
|
]
|
||||||
|
where
|
||||||
|
isFloating :: X Bool
|
||||||
|
isFloating = do
|
||||||
|
wins <- gets windowset
|
||||||
|
return $
|
||||||
|
case W.peek wins of
|
||||||
|
Just w -> M.member w (W.floating wins)
|
||||||
|
Nothing -> False
|
||||||
|
|
||||||
myEventHook :: Event -> X All
|
myEventHook :: Event -> X All
|
||||||
myEventHook =
|
myEventHook =
|
||||||
|
@ -183,7 +184,8 @@ myEventHook =
|
||||||
|
|
||||||
myStartupHook :: X ()
|
myStartupHook :: X ()
|
||||||
myStartupHook = do
|
myStartupHook = do
|
||||||
spawn "initialize_pipes"
|
spawn "update-pipe volume 'monitors volume'"
|
||||||
|
spawn "update-pipe weather 'weather'"
|
||||||
|
|
||||||
myPP :: PP
|
myPP :: PP
|
||||||
myPP =
|
myPP =
|
||||||
|
|
Loading…
Reference in a new issue