From 0486d8387474dce3020f2051bf24134286c14e49 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 16 May 2020 14:50:07 +0200
Subject: [PATCH] Update
---
xmonad.hs | 79 +++++++++++++++++++------------------------------------
1 file changed, 27 insertions(+), 52 deletions(-)
diff --git a/xmonad.hs b/xmonad.hs
index 0439a21..5edaf33 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -28,6 +28,7 @@ import XMonad.Actions.DynamicWorkspaces
import XMonad.Actions.Submap
import XMonad.Actions.TagWindows
import XMonad.Actions.DynamicWorkspaceGroups
+import XMonad.Actions.Minimize
import qualified XMonad.Actions.DynamicWorkspaceOrder as DO
-- Utils
@@ -85,8 +86,8 @@ main = do
xmonad $ docks $ ewmh $ withUrgencyHook LibNotifyUrgencyHook $ defaultConfig
{ modMask = mod4Mask
, focusFollowsMouse = False
- , focusedBorderColor = "#F0F0F0"
- , normalBorderColor = "#002b36"
+ , focusedBorderColor = "#FFFFFF"
+ , normalBorderColor = "#A0A0A0"
, terminal = myTerm
, workspaces = ["#"]
, manageHook = manageHook defaultConfig <+> myManageHook <+> manageDocks <+> xScratchpadsManageHook myScratchPads
@@ -123,22 +124,22 @@ myStartupHook = do
spawnOnce "feh --bg-scale /home/kubat/.xmonad/wallpaper &"
spawn "setxkbmap kubat"
-myLayoutHook = minimize $ boringAuto
- ( (onWorkspace "#" (named "Full" $ noBorders $ Full))
- ((named "BSP" $ avoidStruts $ windowNavigation $ emptyBSP) |||
- (named "Tall" $ avoidStruts $ windowNavigation $ ResizableTall 1 (3.0 / 100.0) 0.5 []) |||
- (named "Full" $ avoidStruts $ noBorders $ Full))
- )
+myLayoutHook =
+ minimize $ boringAuto (toggleLayouts (noBorders Full) others)
+ where others = (named "Tall" $ avoidStruts $ ResizableTall 1 (3.0 / 100.0) 0.5 [])
+ ||| (named "Mirror-Tall" $ avoidStruts $ Mirror $ ResizableTall 1 (3.0 / 100.0) 0.5 [])
+ ||| (named "Full" $ avoidStruts $ Full)
myManageHook = do
- composeAll
- [ className =? "Xmessage" --> doFloat
- , className =? "Unity" --> doFloat
- , className =? "Display" --> doFloat
- , title =? "OCaml graphics" --> doFloat
- , title =? "desktop" --> doIgnore
- , manageDocks
- ]
+ composeAll . concat $
+ [ [ resource =? r --> doIgnore | r <- myIgnores ]
+ , [ className =? c --> doFloat | c <- myFloats ]
+ , [ title =? "OCaml graphics" --> doFloat ]
+ , [ title =? "desktop" --> doIgnore ]
+ , [ isDialog --> doCenterFloat ]
+ , [ manageDocks ]
+ ] where myIgnores = [ "desktop", "desktop_window" ]
+ myFloats = [ "Xmessage", "Unity", "Display" ]
myTerm = "st"
myXPConfig = def { font = "xft:SourceCodePro:size=9" , bgColor = "black" , position = Top }
@@ -168,25 +169,11 @@ myAdditionalKeys =
, ((0, xK_Return), spawn myTerm)
])
- -- Workspace group
- , ((mod4Mask, xK_c), submap . M.fromList $
- [ ((0, xK_a), promptWSGroupAdd myXPConfig "Add group: ")
- , ((0, xK_g), promptWSGroupView myXPConfig "Goto group: ")
- , ((0, xK_d), promptWSGroupForget myXPConfig "Forget group: ")
- ])
-
- -- Tags
- , ((mod4Mask, xK_t), submap . M.fromList $
- [ ((0, xK_a), tagPrompt myXPConfig (\s -> withFocused (addTag s)))
- , ((0, xK_d), tagDelPrompt myXPConfig)
- , ((0, xK_g), tagPrompt myXPConfig (\s -> withTaggedGlobalP s shiftHere))
- ])
-
-- Passwords
- , ((mod4Mask, xK_p), spawn "/home/kubat/.local/bin/passmenu -h 18")
+ , ((mod4Mask, xK_p), spawn "passmenu -h 18")
-- Utility
- , ((mod4Mask, xK_d), spawn "/home/kubat/.local/bin/dmenu_run -h 18")
+ , ((mod4Mask, xK_d), spawn "dmenu_run -h 18")
, ((mod4Mask, xK_b), sendMessage ToggleStruts)
, ((mod4Mask, xK_F1), spawn "i3lock -e -u -t -i /home/kubat/.xmonad/lock")
, ((mod4Mask, xK_Print), spawn "scrot $(date +%F-%H:%M:%S).png -e 'mv $f /home/kubat/pictures/screenshot/'")
@@ -209,27 +196,15 @@ myAdditionalKeys =
, ((mod4Mask, xK_slash), focusMaster)
, ((mod4Mask .|. shiftMask, xK_slash), windows W.swapMaster)
+ , ((mod4Mask, xK_Escape), sendMessage (Toggle "Full"))
+
, ((mod4Mask, xK_exclam), nextScreen)
, ((mod4Mask .|. shiftMask, xK_exclam), shiftNextScreen)
- -- Control for the bsp layout
- , ((mod4Mask .|. shiftMask, xK_8), do { sendMessage $ ExpandTowards U ; sendMessage (IncMasterN 1) })
- , ((mod4Mask .|. shiftMask, xK_6), do { sendMessage $ ExpandTowards R ; sendMessage Expand })
- , ((mod4Mask .|. shiftMask, xK_2), do { sendMessage $ ExpandTowards D ; sendMessage (IncMasterN (-1)) })
- , ((mod4Mask .|. shiftMask, xK_4), do { sendMessage $ ExpandTowards L ; sendMessage Shrink })
-
- , ((mod4Mask, xK_6), sendMessage $ WinNav.Go R)
- , ((mod4Mask, xK_4), sendMessage $ WinNav.Go L)
- , ((mod4Mask, xK_8), sendMessage $ WinNav.Go U)
- , ((mod4Mask, xK_2), sendMessage $ WinNav.Go D)
-
- , ((mod4Mask .|. controlMask, xK_6), sendMessage $ WinNav.Swap R)
- , ((mod4Mask .|. controlMask, xK_4), sendMessage $ WinNav.Swap L)
- , ((mod4Mask .|. controlMask, xK_8), sendMessage $ WinNav.Swap U)
- , ((mod4Mask .|. controlMask, xK_2), sendMessage $ WinNav.Swap D)
-
- , ((mod4Mask, xK_r), sendMessage Rotate)
- , ((mod4Mask, xK_s), sendMessage XMonad.Layout.BinarySpacePartition.Swap)
+ , ((mod4Mask .|. shiftMask, xK_8), sendMessage (IncMasterN 1) )
+ , ((mod4Mask .|. shiftMask, xK_6), sendMessage Expand )
+ , ((mod4Mask .|. shiftMask, xK_2), sendMessage (IncMasterN (-1)))
+ , ((mod4Mask .|. shiftMask, xK_4), sendMessage Shrink )
-- Dynamic workspaces and workspace control
, ((mod4Mask, xK_w), submap . M.fromList $
@@ -259,8 +234,8 @@ myAdditionalKeys =
-- Scratchpads
, ((mod4Mask, xK_x), submap . M.fromList $
- [ ((0, xK_Return), do { scratchpadAction myScratchPads "terminal" ; sendMessage UpdateBoring })
- , ((0, xK_p), do { scratchpadAction myScratchPads "perso" ; sendMessage UpdateBoring })
+ [ ((0, xK_Return), do { scratchpadAction myScratchPads "terminal" ; focusMaster })
+ , ((0, xK_p), do { scratchpadAction myScratchPads "perso" ; focusMaster })
, ((0, xK_x), hideAll myScratchPads)
])
]
--
GitLab