diff --git a/home-manager/modules/xmonad/app/Main.hs b/home-manager/modules/xmonad/app/Main.hs index 3b0ddca..33c0790 100644 --- a/home-manager/modules/xmonad/app/Main.hs +++ b/home-manager/modules/xmonad/app/Main.hs @@ -123,8 +123,10 @@ myKeymap c = , ("S-", spawn "screenshot screen && sleep 0.1 && notify -t 5000 \"snap\"") , ("C-S-", spawn "screenshot focused && sleep 0.1 && notify -t 5000 \"snap\"") - -- Quit xmonad - , ("M-S-k", kill) + -- Kill focused window + , ("M-S-k", kill1) + -- Kill all instances of focused window + , ("M-S-C-k", kill) -- Restart xmonad , ("M-k", spawn "reload") @@ -184,200 +186,12 @@ myKeymap c = ] ++ - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - -- - -- - -- - -- - -- - -- - - - -- - - - -- - - - -- - - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - -- - -- - - - -- - - - -- - - -- - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - -- - -- - - - -- - - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - - - -- - - -- - - -- - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - -- - -- - - - -- - - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - - - -- - - -- - -- mod-[1..9], Switch to workspace N - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - -- - - - -- - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N -- [("M-" ++ m ++ [k], windows $ onCurrentScreen f i) | (i, k) <- zip (workspaces' c) "1234567890" - , (f, m) <- [(W.greedyView, ""), (W.shift, "S-")]] - ++ - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- - -- - -- - -- - -- - -- - -- - -- - [("M-"++m++[key], screenWorkspace sc >>= flip whenJust (windows . f)) - | (key, sc) <- zip ".o," [0..] - , (f, m) <- [(W.view, ""), (W.shift, "S-")]] + , (f, m) <- [(W.greedyView, ""), (W.shift, "S-"), (copy, "S-C-")]] where xMoveWindow :: (Position, Position) @@ -394,11 +208,7 @@ myKeymap c = myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ -- mod-button1, Set the window to floating mode and move by dragging - [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w - >> windows W.shiftMaster)) - - -- mod-button2, Raise the window to the top of the stack - , ((modm, button2), (\w -> focus w >> windows W.shiftMaster)) + [ ((modm, button2), (\w -> focus w >> windows W.shiftMaster)) -- mod-button3, Set the window to floating mode and resize by dragging , ((modm, button3), (\w -> focus w >> mouseResizeWindow w