mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

home/xmonad: cosmetic changes

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2022-09-01 17:40:10 +03:00
parent 3d01d19c09
commit 02598f69ba
Signed by: pleshevskiy
GPG key ID: 1B59187B161C0215
2 changed files with 199 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -27,7 +27,11 @@
in in
{ {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ git-crypt stylua ]; packages = with pkgs; [
git-crypt
stylua # lua formatter
ormolu # haskell formatter
];
}; };
}; };
}; };

228
home/ui/xmonad/config.hs
View file

@ -7,16 +7,29 @@
-- Normally, you'd only override those defaults you care about. -- Normally, you'd only override those defaults you care about.
-- --
-- Imports for Polybar
import qualified Codec.Binary.UTF8.String as UTF8
import qualified DBus as D
import qualified DBus.Client as D
import qualified Data.Map as M
import Data.Monoid import Data.Monoid
import System.Exit import System.Exit
import XMonad import XMonad
import XMonad.Actions.CycleSelectedLayouts (cycleThroughLayouts) import XMonad.Actions.CycleSelectedLayouts (cycleThroughLayouts)
import XMonad.Actions.EasyMotion (ChordKeys (..), import XMonad.Actions.EasyMotion
( ChordKeys (..),
EasyMotionConfig (..), EasyMotionConfig (..),
selectWindow) selectWindow,
)
import XMonad.Hooks.DynamicLog import XMonad.Hooks.DynamicLog
import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Hooks.ManageHelpers
( composeOne,
doCenterFloat,
isDialog,
(-?>),
)
import XMonad.Hooks.StatusBar import XMonad.Hooks.StatusBar
import XMonad.Hooks.StatusBar.PP import XMonad.Hooks.StatusBar.PP
import XMonad.Layout.BoringWindows (boringWindows) import XMonad.Layout.BoringWindows (boringWindows)
@ -26,17 +39,10 @@ import XMonad.Layout.LimitWindows (limitWindows)
import XMonad.Layout.NoBorders (smartBorders) import XMonad.Layout.NoBorders (smartBorders)
import XMonad.Layout.Spacing (spacing) import XMonad.Layout.Spacing (spacing)
import XMonad.Layout.ThreeColumns (ThreeCol (..)) import XMonad.Layout.ThreeColumns (ThreeCol (..))
import qualified XMonad.StackSet as W
import XMonad.Util.EZConfig import XMonad.Util.EZConfig
import XMonad.Util.Run import XMonad.Util.Run
import qualified Data.Map as M
import qualified XMonad.StackSet as W
-- Imports for Polybar
import qualified Codec.Binary.UTF8.String as UTF8
import qualified DBus as D
import qualified DBus.Client as D
-- The preferred terminal program, which is used in a binding below and by -- The preferred terminal program, which is used in a binding below and by
-- certain contrib modules. -- certain contrib modules.
-- --
@ -61,51 +67,65 @@ myBorderWidth = 2
-- --
myModMask = mod1Mask myModMask = mod1Mask
-- Workspaces
webWs = "web" webWs = "web"
finWs = "fin" finWs = "fin"
sysWs = "sys" sysWs = "sys"
comWs = "com" comWs = "com"
devWs = ["dev", "dev2", "dev3"] devWs = ["dev", "dev2", "dev3"]
myWorkspaces = [webWs] <> devWs <> [finWs, sysWs, comWs] myWorkspaces = [webWs] <> devWs <> [finWs, sysWs, comWs]
-- Colors
blue = "#2E9AFE" blue = "#2E9AFE"
gray = "#7F7F7F" gray = "#7F7F7F"
orange = "#ea4300" orange = "#ea4300"
purple = "#9058c7" purple = "#9058c7"
red = "#722222" red = "#722222"
-- Border colors for unfocused and focused windows, respectively. -- Border colors for unfocused and focused windows, respectively.
-- --
myNormalBorderColor = gray myNormalBorderColor = gray
myFocusedBorderColor = blue myFocusedBorderColor = blue
main :: IO () main :: IO ()
main = mkDbusClient >>= main' main = mkDbusClient >>= main'
main' :: D.Client -> IO () main' :: D.Client -> IO ()
main' dbus = xmonad . docks . ewmhFullscreen . ewmh $ def main' dbus =
-- simple stuff xmonad . docks . ewmhFullscreen . ewmh $
{ terminal = myTerminal def
, focusFollowsMouse = myFocusFollowsMouse { -- simple stuff
, clickJustFocuses = myClickJustFocuses terminal = myTerminal,
, borderWidth = myBorderWidth focusFollowsMouse = myFocusFollowsMouse,
, modMask = myModMask clickJustFocuses = myClickJustFocuses,
, workspaces = myWorkspaces borderWidth = myBorderWidth,
, normalBorderColor = myNormalBorderColor modMask = myModMask,
, focusedBorderColor = myFocusedBorderColor workspaces = myWorkspaces,
normalBorderColor = myNormalBorderColor,
focusedBorderColor = myFocusedBorderColor,
-- key bindings -- key bindings
, keys = myKeys keys = myKeys,
, mouseBindings = myMouseBindings mouseBindings = myMouseBindings,
-- hooks, layouts -- hooks, layouts
, layoutHook = myLayout layoutHook = myLayout,
, manageHook = myManageHook manageHook = myManageHook,
, handleEventHook = myEventHook handleEventHook = myEventHook,
, logHook = myPolybarLogHook dbus logHook = myPolybarLogHook dbus,
, startupHook = myStartupHook startupHook = myStartupHook
} }
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- Polybar settings (needs DBus client). -- Polybar settings (needs DBus client).
-- --
@ -125,18 +145,19 @@ dbusOutput dbus str =
mname = D.memberName_ "Update" mname = D.memberName_ "Update"
signal = D.signal opath iname mname signal = D.signal opath iname mname
body = [D.toVariant $ UTF8.decodeString str] body = [D.toVariant $ UTF8.decodeString str]
in D.emit dbus $ signal { D.signalBody = body } in D.emit dbus $ signal {D.signalBody = body}
polybarHook :: D.Client -> PP polybarHook :: D.Client -> PP
polybarHook dbus = polybarHook dbus =
let wrapper c = wrap ("%{F" <> c <> "}") "%{F-}" let wrapper c = wrap ("%{F" <> c <> "}") "%{F-}"
in def { ppOutput = dbusOutput dbus in def
, ppCurrent = wrapper blue { ppOutput = dbusOutput dbus,
, ppVisible = wrapper purple ppCurrent = wrapper blue,
, ppUrgent = wrapper orange ppVisible = wrapper purple,
, ppHidden = wrapper gray ppUrgent = wrapper orange,
, ppHiddenNoWindows = wrapper red ppHidden = wrapper gray,
, ppTitle = wrapper purple . shorten 90 ppHiddenNoWindows = wrapper red,
ppTitle = wrapper purple . shorten 90
} }
myPolybarLogHook dbus = myLogHook <+> dynamicLogWithPP (polybarHook dbus) myPolybarLogHook dbus = myLogHook <+> dynamicLogWithPP (polybarHook dbus)
@ -159,8 +180,8 @@ myLayout = avoidStruts . smartBorders $ (Mirror tiled ||| tiled ||| column3 |||
column3 = gapSpaced 5 $ ThreeColMid nmaster incRatio ratio column3 = gapSpaced 5 $ ThreeColMid nmaster incRatio ratio
nmaster = 1 nmaster = 1
incRatio = (3/100) incRatio = (3 / 100)
ratio = (1/2) ratio = (1 / 2)
gapSpaced g = spacing g . myGaps g gapSpaced g = spacing g . myGaps g
myGaps gap = gaps [(U, gap), (D, gap), (L, gap), (R, gap)] myGaps gap = gaps [(U, gap), (D, gap), (L, gap), (R, gap)]
@ -187,6 +208,7 @@ myLogHook = return ()
-- Event handling -- Event handling
-- * EwmhDesktops users should change this to ewmhDesktopsEventHook -- * EwmhDesktops users should change this to ewmhDesktopsEventHook
-- --
-- Defines a custom handler function for X Events. The function should -- Defines a custom handler function for X Events. The function should
-- return (All True) if the default handler is to be run afterwards. To -- return (All True) if the default handler is to be run afterwards. To
@ -209,124 +231,112 @@ myEventHook = mempty
-- To match on the WM_NAME, you can use 'title' in the same way that -- To match on the WM_NAME, you can use 'title' in the same way that
-- 'className' and 'resource' are used below. -- 'className' and 'resource' are used below.
-- --
myManageHook = composeAll myManageHook = manageApps
[ resource =? "desktop_window" --> doIgnore where
, resource =? "kdesktop" --> doIgnore isRole = stringProperty "WM_WINDOW_ROLE"
isPopup = isRole =? "pop-up"
manageApps =
composeOne
[ resource =? "desktop_window" -?> doIgnore,
resource =? "kdesktop" -?> doIgnore,
-- general
isPopup -?> doCenterFloat,
isDialog -?> doCenterFloat,
-- apps -- apps
, className =? "Gimp" --> doFloat className =? "Gimp" -?> doFloat,
, className =? "Gnome-calculator" --> doFloat className =? "nheko" -?> doShift comWs,
, className =? "Gnome-font-viewer" --> doFloat className =? "KotatogramDesktop" -?> doShift comWs,
, className =? "Org.gnome.Nautilus" --> doFloat className =? "gnome-calculator" -?> doCenterFloat
, className =? "KotatogramDesktop" --> doShift comWs
-- my libs
, resource =? "hwt" --> doFloat
] ]
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- Key bindings. Add, modify or remove key bindings here. -- Key bindings. Add, modify or remove key bindings here.
-- --
myKeys conf = mkKeymap conf $ myKeys conf =
mkKeymap conf $
-- launch a terminal -- launch a terminal
[ ("M-S-<Return>", spawn $ XMonad.terminal conf) [ ("M-S-<Return>", spawn $ XMonad.terminal conf),
-- launch a 'flameshot' to screenshot -- launch a 'flameshot' to screenshot
, ("M-S-s", safeSpawn "flameshot" ["gui"]) ("M-S-s", safeSpawn "flameshot" ["gui"]),
-- launch 'librewolf' browser -- launch 'librewolf' browser
, ("M-S-b", spawn "librewolf") ("M-S-b", spawn "librewolf"),
-- launch 'dmenu_run' to choose applications -- launch 'dmenu_run' to choose applications
, ("M-p", spawn "dmenu_run") ("M-p", spawn "dmenu_run"),
-- close focused window -- close focused window
, ("M4-S-c", kill) ("M4-S-c", kill),
-- Rotate through the available layout algorithms -- Rotate through the available layout algorithms
, ("M-<Space>", cycleThroughLayouts ["Full", "Mirror Spacing Tall"]) ("M-<Space>", cycleThroughLayouts ["Full", "Mirror Spacing Tall"]),
, ("M-<Tab>", cycleThroughLayouts ["Spacing ThreeCol", "Spacing Tall", "Mirror Spacing Tall"]) ("M-<Tab>", cycleThroughLayouts ["Spacing ThreeCol", "Spacing Tall", "Mirror Spacing Tall"]),
-- Reset the layouts on the current workspace to default -- Reset the layouts on the current workspace to default
, ("M-S-<Space>", setLayout $ XMonad.layoutHook conf) ("M-S-<Space>", setLayout $ XMonad.layoutHook conf),
-- Resize viewed windows to the correct size -- Resize viewed windows to the correct size
, ("M-n", refresh) ("M-n", refresh),
-- Easy moution to focus windows -- Easy moution to focus windows
, ("M-s", selectWindow def{sKeys = AnyKeys [xK_a, xK_o, xK_e, xK_u, xK_h, xK_t, xK_n, xK_s]} >>= (`whenJust` windows . W.focusWindow)) ("M-s", selectWindow easyMotionConfig >>= (`whenJust` windows . W.focusWindow)),
-- Move focus to the next window -- Move focus to the next window
, ("M-j", windows W.focusDown) ("M-j", windows W.focusDown),
-- Move focus to the previous window -- Move focus to the previous window
, ("M-k", windows W.focusUp) ("M-k", windows W.focusUp),
-- Move focus to the master window -- Move focus to the master window
, ("M-m", windows W.focusMaster) ("M-m", windows W.focusMaster),
-- Swap the focused window and the master window -- Swap the focused window and the master window
, ("M-<Return>", windows W.swapMaster) ("M-<Return>", windows W.swapMaster),
-- Swap the focused window with the next window -- Swap the focused window with the next window
, ("M-S-j", windows W.swapDown) ("M-S-j", windows W.swapDown),
-- Swap the focused window with the previous window -- Swap the focused window with the previous window
, ("M-S-k", windows W.swapUp) ("M-S-k", windows W.swapUp),
-- Shrink the master area -- Shrink the master area
, ("M-h", sendMessage Shrink) ("M-h", sendMessage Shrink),
-- Expand the master area -- Expand the master area
, ("M-l", sendMessage Expand) ("M-l", sendMessage Expand),
-- Push window back into tiling -- Push window back into tiling
, ("M-t", withFocused $ windows . W.sink) ("M-t", withFocused $ windows . W.sink),
-- Increment the number of windows in the master area -- Increment the number of windows in the master area
, ("M-,", sendMessage $ IncMasterN 1) ("M-,", sendMessage $ IncMasterN 1),
-- Deincrement the number of windows in the master area -- Deincrement the number of windows in the master area
, ("M-.", sendMessage $ IncMasterN (-1)) ("M-.", sendMessage $ IncMasterN (-1)),
-- Toggle the status bar gap -- Toggle the status bar gap
-- Use this binding with avoidStruts from Hooks.ManageDocks. -- Use this binding with avoidStruts from Hooks.ManageDocks.
-- See also the statusBar function from Hooks.DynamicLog. -- See also the statusBar function from Hooks.DynamicLog.
-- --
-- , ("M-b", sendMessage ToggleStruts) -- , ("M-b", sendMessage ToggleStruts)
-- Lock screen -- Lock screen
, ("M4-l", spawn "betterlockscreen --lock --display 1 -- -e") ("M4-l", spawn "betterlockscreen --lock --display 1 -- -e"),
-- Change volume -- Change volume
, ("<XF86AudioMute>", spawn "amixer -q sset Master toggle") ("<XF86AudioMute>", spawn "amixer -q sset Master toggle"),
, ("<XF86AudioRaiseVolume>", spawn "amixer -q sset Master 5%+") ("<XF86AudioRaiseVolume>", spawn "amixer -q sset Master 5%+"),
, ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%-") ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%-"),
-- Keyboard apps -- Keyboard apps
, ("<XF86Calculator>", spawn "gnome-calculator") ("<XF86Calculator>", spawn "gnome-calculator"),
-- Quit xmonad -- Quit xmonad
, ("M4-S-q", io exitSuccess) ("M4-S-q", io exitSuccess)
] ]
++ ++
-- --
-- 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
-- --
[("M-" ++ m ++ show k, windows $ f i) [ ("M-" ++ m ++ show k, windows $ f i)
| (i, k) <- zip (XMonad.workspaces conf) [1..9] | (i, k) <- zip (XMonad.workspaces conf) [1 .. 9],
, (f, m) <- [(W.greedyView, ""), (W.shift, "S-")]] (f, m) <- [(W.greedyView, ""), (W.shift, "S-")]
]
where
easyMotionConfig =
def
{ sKeys = AnyKeys [xK_a, xK_o, xK_e, xK_u, xK_h, xK_t, xK_n, xK_s]
}
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- Mouse bindings: default actions bound to mouse events -- Mouse bindings: default actions bound to mouse events
-- --
myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList myMouseBindings (XConfig {XMonad.modMask = modm}) =
M.fromList
-- mod-button1, Set the window to floating mode and move by dragging -- mod-button1, Set the window to floating mode and move by dragging
[ ((modm, button1), \w -> focus w >> mouseMoveWindow w >> windows W.shiftMaster) [ ((modm, button1), \w -> focus w >> mouseMoveWindow w >> windows W.shiftMaster),
-- mod-button2, Raise the window to the top of the stack -- 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 -- mod-button3, Set the window to floating mode and resize by dragging
, ((modm, button3), \w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster) ((modm, button3), \w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster)
-- you may also bind events to the mouse scroll wheel (button4 and button5) -- you may also bind events to the mouse scroll wheel (button4 and button5)
] ]