jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xmonad: Remove unused layouts

Browse source
This commit is contained in:
Alexander Kobjolke 2024-03-01 21:38:44 +01:00
parent 05647a01dd
commit bc675f00ac
1 changed files with 66 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

62
modules/wm/xmonad/config.hs
View file

@ -1,23 +1,23 @@
import XMonad import XMonad
import XMonad.Actions.CycleWS qualified as WS
import XMonad.Actions.Navigation2D (navigation2DP, windowGo, windowSwap) import XMonad.Actions.Navigation2D (navigation2DP, windowGo, windowSwap)
import qualified XMonad.Actions.CycleWS as WS import XMonad.Hooks.EwmhDesktops
import XMonad.Util.Ungrab (unGrab) import XMonad.Hooks.ManageDocks qualified as Docks
import XMonad.Layout.ThreeColumns import XMonad.Hooks.SetWMName
import XMonad.Layout.ToggleLayouts (ToggleLayout(..), toggleLayouts)
import XMonad.Layout.BinarySpacePartition import XMonad.Layout.BinarySpacePartition
import XMonad.Layout.BorderResize (borderResize) import XMonad.Layout.BorderResize (borderResize)
import XMonad.Hooks.EwmhDesktops import XMonad.Layout.ThreeColumns
import XMonad.Hooks.SetWMName import XMonad.Layout.ToggleLayouts (ToggleLayout (..), toggleLayouts)
import qualified XMonad.Hooks.ManageDocks as Docks import XMonad.Util.EZConfig qualified as EZ
import qualified XMonad.Util.EZConfig as EZ import XMonad.Util.Ungrab (unGrab)
import Numeric.Natural
import Control.Monad (when) import Control.Monad (when)
import Text.Printf (printf) import Numeric.Natural
import System.Posix.Process (executeFile)
import System.Info (arch,os)
import System.Environment (getArgs) import System.Environment (getArgs)
import System.FilePath ((</>)) import System.FilePath ((</>))
import System.Info (arch, os)
import System.Posix.Process (executeFile)
import Text.Printf (printf)
compiledConfig = printf "xmonad-%s-%s" arch os compiledConfig = printf "xmonad-%s-%s" arch os
@ -31,14 +31,9 @@ compileRestart resume = do
executeFile (cacheDir dirs </> compiledConfig) False args Nothing executeFile (cacheDir dirs </> compiledConfig) False args Nothing
) )
myLayout = borderResize $ Docks.avoidStruts $ layout myLayout = borderResize $ Docks.avoidStruts layout
where where
layout = (emptyBSP ||| columns ||| tiled ||| Full) layout = emptyBSP ||| Full
tiled = Tall nmaster delta ratio
columns = ThreeColMid nmaster delta ratio
nmaster = 1 -- default number of windows in the master pane
ratio = 1/2 -- default proportion occupied by master pane
delta = 3/100 -- percent of screen to increment when resizing
main :: IO () main :: IO ()
main = getDirectories >>= launch myConfig main = getDirectories >>= launch myConfig
@ -48,7 +43,8 @@ main = getDirectories >>= launch myConfig
windowMoveSplit :: Direction2D -> Bool -> X () windowMoveSplit :: Direction2D -> Bool -> X ()
windowMoveSplit direction _ = sendMessage $ MoveSplit direction windowMoveSplit direction _ = sendMessage $ MoveSplit direction
data VolumeCommand = ToggleVolume data VolumeCommand
= ToggleVolume
| LowerVolume Natural | LowerVolume Natural
| RaiseVolume Natural | RaiseVolume Natural
@ -63,15 +59,19 @@ interpretVolumeCommand command = "amixer -q set Master " <> cmd
changeVolume :: VolumeCommand -> X () changeVolume :: VolumeCommand -> X ()
changeVolume = spawn . interpretVolumeCommand changeVolume = spawn . interpretVolumeCommand
myConfig = ewmhFullscreen $ ewmh $ Docks.docks $ nav $ def myConfig =
ewmhFullscreen $
ewmh $
Docks.docks $
nav $
def
{ modMask = mod4Mask -- Use Super instead of Alt { modMask = mod4Mask -- Use Super instead of Alt
, terminal = "alacritty" , terminal = "alacritty"
, layoutHook = myLayout , layoutHook = myLayout
-- this seems to be necessary to make java gui applications work :( , -- this seems to be necessary to make java gui applications work :(
, startupHook = ewmhDesktopsStartup >> setWMName "LG3D" startupHook = ewmhDesktopsStartup >> setWMName "LG3D"
} }
`EZ.additionalKeysP` `EZ.additionalKeysP` [ ("M-S-z", spawn "xscreensaver-command -lock")
[ ("M-S-z", spawn "xscreensaver-command -lock")
, ("M-S-r", compileRestart True) , ("M-S-r", compileRestart True)
, ("M-S-q", restart "xmonad" True) , ("M-S-q", restart "xmonad" True)
, ("M-C-s", unGrab *> spawn "scrot -s") , ("M-C-s", unGrab *> spawn "scrot -s")
@ -83,20 +83,17 @@ myConfig = ewmhFullscreen $ ewmh $ Docks.docks $ nav $ def
, ("M-l", WS.toggleWS) , ("M-l", WS.toggleWS)
, ("M-g", WS.prevWS) , ("M-g", WS.prevWS)
, ("M-r", WS.nextWS) , ("M-r", WS.nextWS)
, -- backlight control
-- backlight control ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
, ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")
, ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 5") , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 5")
, ("<F5>", spawn "xbacklight -dec 5") , ("<F5>", spawn "xbacklight -dec 5")
, ("<F6>", spawn "xbacklight -inc 5") , ("<F6>", spawn "xbacklight -inc 5")
, -- volume control
-- volume control ("<XF86AudioMute>", changeVolume ToggleVolume)
, ("<XF86AudioMute>", changeVolume ToggleVolume)
, ("<XF86AudioLowerVolume>", changeVolume $ LowerVolume 5) , ("<XF86AudioLowerVolume>", changeVolume $ LowerVolume 5)
, ("<XF86AudioRaiseVolume>", changeVolume $ RaiseVolume 5) , ("<XF86AudioRaiseVolume>", changeVolume $ RaiseVolume 5)
, ("M-a", sendMessage Balance) , ("M-a", sendMessage Balance)
, ("M-S-a", sendMessage Equalize) , ("M-S-a", sendMessage Equalize)
, ("M-o", sendMessage Rotate) , ("M-o", sendMessage Rotate)
@ -107,7 +104,6 @@ myConfig = ewmhFullscreen $ ewmh $ Docks.docks $ nav $ def
appLauncher = "rofi -show combi -modes combi -combi-modes window,drun,run,ssh" appLauncher = "rofi -show combi -modes combi -combi-modes window,drun,run,ssh"
passLauncher = "rofi-pass" passLauncher = "rofi-pass"
-- myManageHook :: ManageHook -- myManageHook :: ManageHook
-- myManageHook = composeAll -- myManageHook = composeAll
-- [ className =? "Gimp" --> doFloat -- [ className =? "Gimp" --> doFloat