New screen, new layout

This commit is contained in:
Martin Potier 2019-05-31 18:42:52 +03:00
parent 310dfd47eb
commit bc82caba10
No known key found for this signature in database
GPG Key ID: D4DD957DBA4AD89E
2 changed files with 10 additions and 5 deletions

View File

@ -10,6 +10,7 @@ import Graphics.X11.Types
import System.Exit import System.Exit
import Text.EditDistance import Text.EditDistance
import XMonad import XMonad
import XMonad.Actions.CopyWindow (kill1,copy)
import XMonad.Actions.CycleWS import XMonad.Actions.CycleWS
import XMonad.Actions.DynamicProjects import XMonad.Actions.DynamicProjects
import XMonad.Core import XMonad.Core
@ -18,6 +19,7 @@ import XMonad.Operations
import XMonad.Prompt import XMonad.Prompt
import XMonad.Prompt.ConfirmPrompt import XMonad.Prompt.ConfirmPrompt
import XMonad.Prompt.Shell import XMonad.Prompt.Shell
import XMonad.Prompt.Workspace (workspacePrompt)
import XMonad.Util.EZConfig import XMonad.Util.EZConfig
import XMonad.Util.NamedScratchpad import XMonad.Util.NamedScratchpad
import qualified Solarized as S import qualified Solarized as S
@ -39,7 +41,6 @@ modify conf = conf
, ("<XF86AudioPlay>", spawn "/run/current-system/sw/bin/mpc toggle") , ("<XF86AudioPlay>", spawn "/run/current-system/sw/bin/mpc toggle")
, ("<XF86AudioNext>", spawn "/run/current-system/sw/bin/mpc next") , ("<XF86AudioNext>", spawn "/run/current-system/sw/bin/mpc next")
, ("<XF86AudioPrev>", spawn "/run/current-system/sw/bin/mpc prev") , ("<XF86AudioPrev>", spawn "/run/current-system/sw/bin/mpc prev")
, ("M-<Delete>", kill)
, ("M-<Down>", windows W.focusDown) , ("M-<Down>", windows W.focusDown)
, ("M-<Esc>", sendMessage (Toggle "Full")) , ("M-<Esc>", sendMessage (Toggle "Full"))
, ("M-$", sendMessage (Toggle "Full")) , ("M-$", sendMessage (Toggle "Full"))
@ -63,6 +64,9 @@ modify conf = conf
, ("M-d", passPrompt promptConfig) , ("M-d", passPrompt promptConfig)
-- Scratchpads -- Scratchpads
, ("M-p p", namedScratchpadAction R.pads "htop") , ("M-p p", namedScratchpadAction R.pads "htop")
-- Copy windows to workspaces
, ("M-<Delete>", kill1)
, ("M-c", workspacePrompt promptConfig (\name -> windows $ copy name))
] ]
viewProject :: WorkspaceId -> X () viewProject :: WorkspaceId -> X ()

View File

@ -15,6 +15,7 @@ import XMonad.Layout.PerScreen
import XMonad.Layout.Reflect import XMonad.Layout.Reflect
import XMonad.Layout.ResizableTile (ResizableTall(..)) import XMonad.Layout.ResizableTile (ResizableTall(..))
import XMonad.Layout.Spacing import XMonad.Layout.Spacing
import XMonad.Layout.ThreeColumns (ThreeCol(..))
import XMonad.Layout.ToggleLayouts (toggleLayouts) import XMonad.Layout.ToggleLayouts (toggleLayouts)
@ -31,11 +32,11 @@ import Scratchpad (modify)
layouts = toggleLayouts fullscreen tiled layouts = toggleLayouts fullscreen tiled
where where
fullscreen = (noBorders Full) fullscreen = (noBorders Full)
tiled = smarts $ ifWider 1280 wideScreen tallScreen tiled = smarts $ ifWider 1280 wideScreen normalScreen
wideScreen = reflectHoriz $ resizableTall wideScreen = ThreeColMid 1 (5/100) (1/2)
tallScreen = Mirror resizableTall normalScreen = resizableTall
smarts = (smartSpacingWithEdge 5) . smartBorders
resizableTall = ResizableTall 1 (5/100) (1/2) [] resizableTall = ResizableTall 1 (5/100) (1/2) []
smarts = (smartSpacingWithEdge 5) . smartBorders
-- Use the `xprop' tool to get the info you need for these matches. -- Use the `xprop' tool to get the info you need for these matches.
-- For className, use the second value that xprop gives you. -- For className, use the second value that xprop gives you.