update subrepos

This commit is contained in:
qvalentin 2021-12-01 18:05:17 +01:00
parent 1ec06a92ba
commit 2a1d469dd4
3 changed files with 29 additions and 20 deletions

2
xmonad

@ -1 +1 @@
Subproject commit 33a86c0cdb9aa481e23cc5527a997adef5e32d42
Subproject commit dbe9c4f799fd826c199169d012c2d2687b210a7f

@ -1 +1 @@
Subproject commit 20fdcbad0181d9e8fc7571799b1bb02952489df6
Subproject commit 28aa164abd853a237e409d0fbb9f3819f253cf56

View File

@ -1,12 +1,12 @@
import Control.Monad (liftM2)
import Data.List (isInfixOf)
import qualified Data.Monoid
import Data.Ratio
import XMonad
( ChangeLayout (NextLayout),
Default (def),
Full (Full),
Mirror (Mirror),
MonadReader (reader),
Query,
Tall (Tall),
WindowSet,
@ -30,6 +30,7 @@ import XMonad
doFloat,
doIgnore,
doShift,
handleEventHook,
mod4Mask,
resource,
sendMessage,
@ -56,25 +57,31 @@ import XMonad.Hooks.DynamicLog
ppTitleSanitize,
ppUrgent
),
ppVisible,
shorten,
wrap,
xmobarBorder,
xmobarColor,
xmobarRaw,
xmobarStrip, ppVisible
xmobarStrip,
)
import XMonad.Hooks.EwmhDesktops
( activateLogHook,
ewmh,
( ewmh,
ewmhFullscreen,
)
import XMonad.Hooks.InsertPosition (Focus (Newer), Position (End), insertPosition)
import XMonad.Hooks.ManageHelpers (doRectFloat)
import XMonad.Hooks.Place (placeHook, simpleSmart)
import XMonad.Hooks.StatusBar
( defToggleStrutsKey,
statusBarProp,
withEasySB,
)
import XMonad.Layout (Resize (Expand, Shrink))
import XMonad.Layout.Fullscreen (fullscreenEventHook)
import qualified XMonad.Layout.LayoutModifier
import XMonad.Layout.Named (named)
import XMonad.Layout.NoBorders
import XMonad.Layout.Spacing
( Border (Border),
Spacing,
@ -85,15 +92,12 @@ import XMonad.Layout.WindowNavigation
Navigate (Go),
windowNavigation,
)
import XMonad.StackSet (Workspace (tag), currentTag, focusWindow, greedyView, integrate', shift, stack)
import XMonad.StackSet (RationalRect (RationalRect), Workspace (tag), currentTag, greedyView, integrate', shift, stack)
import XMonad.Util.EZConfig (additionalKeysP)
import XMonad.Util.Loggers (logTitles)
import XMonad.Util.SpawnOnce (spawnOnce)
import XMonad.Util.Ungrab (unGrab)
import XMonad.Util.WorkspaceCompare (getSortByIndex)
import XMonad.Layout (Resize(Expand,Shrink) )
import XMonad.Layout.NoBorders
import XMonad.Layout.Named (named)
main :: IO ()
main = do
@ -108,9 +112,13 @@ main = do
normalBorderColor = "#000000",
focusedBorderColor = colors !! 7,
workspaces = myWorkspaces,
manageHook = myManageHook,
manageHook =
placeHook simpleSmart
<+> myManageHook,
layoutHook = myLayout,
logHook = activateLogHook (reader focusWindow >>= doF) <+> logHook def
handleEventHook =
handleEventHook def <+> fullscreenEventHook
-- logHook = activateLogHook (reader focusWindow >>= doF) <+> logHook def
}
`additionalKeysP` [ ("M-S-z", spawn "xscreensaver-command -lock"),
("M-S-s", unGrab *> spawn "cast_screenshot"),
@ -138,7 +146,6 @@ main = do
("M-<Escape>", spawn "betterlockscreen -l")
]
myXmobarPP :: [String] -> PP
myXmobarPP colors =
def
@ -196,6 +203,7 @@ mySpacing' i = spacingRaw True (Border i 0 i i) True (Border i 0 i i) True
--myWorkspaces = [" dev ", " www ", " sys ", " doc ", " vbox ", " chat ", " mus ", " vid ", " gfx "]
myWorkspaces :: [String]
myWorkspaces = show <$> ([1 .. 9] :: [Integer])
myLayout = smartBorders $ windowNavigation tiled ||| smartBorders Full ||| Mirror tiled
where
tiled = named "Tall" $ mySpacing' 8 $ Tall nmaster delta ratio
@ -231,7 +239,8 @@ myManageHook =
className =? "alfaview" --> viewShift (myWorkspaces !! 3),
className =? "jetbrains-idea" --> viewShift (myWorkspaces !! 4),
className =? "jetbrains-code-with-me-guest" --> viewShift (myWorkspaces !! 4),
(className =? "jetbrains-studio") <&&> (title ~=? "win") --> doIgnore
(className =? "jetbrains-studio") <&&> (title ~=? "win") --> doIgnore,
(className =? "TelegramDesktop") <&&> (title ~=? "Media viewer") --> doFloat
]
<+> insertPosition End Newer
where