diff --git a/home/.config/xmonad/xmonad.hs b/home/.config/xmonad/xmonad.hs index 719188f..3c018a5 100644 --- a/home/.config/xmonad/xmonad.hs +++ b/home/.config/xmonad/xmonad.hs @@ -19,7 +19,7 @@ import qualified Data.Map as M -- Hooks import XMonad.Hooks.DynamicLog (dynamicLogWithPP, wrap, xmobarPP, xmobarColor, shorten, PP(..)) -import XMonad.Hooks.ManageDocks (avoidStruts, docksEventHook, manageDocks, ToggleStruts(..)) +import XMonad.Hooks.ManageDocks (avoidStruts, docks, manageDocks, ToggleStruts(..)) import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat) @@ -33,7 +33,6 @@ import XMonad.Layout.ResizableTile -- Layouts modifiers import XMonad.Layout.LayoutModifier import XMonad.Layout.LimitWindows (limitWindows, increaseLimit, decreaseLimit) -import XMonad.Layout.Magnifier import XMonad.Layout.MultiToggle (mkToggle, single, EOT(EOT), (??)) import XMonad.Layout.MultiToggle.Instances (StdTransformers(NBFULL, MIRROR, NOBORDERS)) import XMonad.Layout.NoBorders @@ -253,15 +252,6 @@ tall = renamed [Replace "tall"] $ limitWindows 12 $ mySpacing 8 $ ResizableTall 1 (3/100) (1/2) [] -magnify = renamed [Replace "magnify"] - $ smartBorders - $ windowNavigation - $ addTabs shrinkText myTabTheme - $ subLayout [] (smartBorders Simplest) - $ magnifier - $ limitWindows 12 - $ mySpacing 8 - $ ResizableTall 1 (3/100) (1/2) [] floats = renamed [Replace "floats"] $ smartBorders $ limitWindows 20 simplestFloat @@ -291,7 +281,6 @@ myLayoutHook = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts float $ mkToggle (NBFULL ?? NOBORDERS ?? EOT) myDefaultLayout where myDefaultLayout = withBorder myBorderWidth tall - ||| magnify ||| floats ||| grid ||| spirals @@ -384,13 +373,12 @@ main = do xmproc0 <- spawnPipe "xmobar -x 0 $HOME/.config/xmobar/xmobarrc0" xmproc1 <- spawnPipe "xmobar -x 1 $HOME/.config/xmobar/xmobarrc1" -- Xmonad config definitions - xmonad $ ewmh def + xmonad $ ewmh $ docks $ def { modMask = myModMask , terminal = myTerminal , workspaces = myWorkspaces , startupHook = myStartupHook , manageHook = myManageHook <+> manageDocks - , handleEventHook = docksEventHook --, layoutHook = showWName' myShowWNameTheme $ myLayoutHook , layoutHook = myLayoutHook , borderWidth = myBorderWidth