mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2024-11-22 13:24:40 +01:00
format and fix a bit according to lsp suggestions
This commit is contained in:
parent
1921ea7357
commit
cd2ff22e00
|
@ -7,27 +7,21 @@
|
||||||
-- Normally, you'd only override those defaults you care about.
|
-- Normally, you'd only override those defaults you care about.
|
||||||
--
|
--
|
||||||
|
|
||||||
import XMonad
|
import Control.Monad (when)
|
||||||
|
import Data.Map qualified as M
|
||||||
import Data.Monoid
|
import Data.Monoid
|
||||||
|
import Graphics.X11.ExtraTypes.XF86
|
||||||
import System.Exit
|
import System.Exit
|
||||||
|
import XMonad
|
||||||
|
import XMonad.Actions.KeyRemap
|
||||||
|
import XMonad.Hooks.EwmhDesktops
|
||||||
import XMonad.Hooks.StatusBar
|
import XMonad.Hooks.StatusBar
|
||||||
import XMonad.Hooks.StatusBar.PP
|
import XMonad.Hooks.StatusBar.PP
|
||||||
import XMonad.Hooks.EwmhDesktops
|
|
||||||
|
|
||||||
import qualified XMonad.StackSet as W
|
|
||||||
import qualified Data.Map as M
|
|
||||||
|
|
||||||
import XMonad.Layout.Spacing
|
import XMonad.Layout.Spacing
|
||||||
import XMonad.Layout.Tabbed
|
import XMonad.Layout.Tabbed
|
||||||
|
|
||||||
import XMonad.Actions.KeyRemap
|
|
||||||
|
|
||||||
import XMonad.Prompt
|
import XMonad.Prompt
|
||||||
import XMonad.Prompt.Layout
|
import XMonad.Prompt.Layout
|
||||||
import Graphics.X11.ExtraTypes.XF86
|
import XMonad.StackSet qualified as W
|
||||||
|
|
||||||
import Control.Monad (when)
|
|
||||||
|
|
||||||
-- 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.
|
||||||
|
@ -67,63 +61,55 @@ myWorkspaces = ["comms","browser","3","4","5","6","7","8","9"]
|
||||||
-- Border colors for unfocused and focused windows, respectively.
|
-- Border colors for unfocused and focused windows, respectively.
|
||||||
--
|
--
|
||||||
myNormalBorderColor = "#3c3836"
|
myNormalBorderColor = "#3c3836"
|
||||||
|
|
||||||
myFocusedBorderColor = "#504945"
|
myFocusedBorderColor = "#504945"
|
||||||
|
|
||||||
myRemaps = KeymapTable [ ((0, xK_a), (0, xK_b)) ]
|
myRemaps = KeymapTable [
|
||||||
|
-- ((0, xK_a), (0, xK_b))
|
||||||
|
]
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- Key bindings. Add, modify or remove key bindings here.
|
-- Key bindings. Add, modify or remove key bindings here.
|
||||||
--
|
--
|
||||||
myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
|
myKeys conf@(XConfig {XMonad.modMask = modm}) =
|
||||||
[ ((modm, xK_Return), spawn $ XMonad.terminal conf)
|
M.fromList $
|
||||||
, ((modm .|. shiftMask, xK_q), kill)
|
[ ((modm, xK_Return), spawn $ XMonad.terminal conf),
|
||||||
|
((modm .|. shiftMask, xK_q), kill),
|
||||||
-- -- Rotate through the available layout algorithms
|
-- -- Rotate through the available layout algorithms
|
||||||
, ((modm, xK_space ), sendMessage NextLayout)
|
((modm, xK_space), sendMessage NextLayout),
|
||||||
|
|
||||||
-- rofiing
|
-- rofiing
|
||||||
, ((modm, xK_d), spawn "rofi -show drun")
|
((modm, xK_d), spawn "rofi -show drun"),
|
||||||
, ((modm .|. shiftMask, xK_e), spawn "rofi -show desktopctl -modes desktopctl:desktopctl -show-icons")
|
((modm .|. shiftMask, xK_e), spawn "rofi -show desktopctl -modes desktopctl:desktopctl -show-icons"),
|
||||||
, ((modm, xK_m), spawn "menu-qalc -- -theme gruvbox-dark")
|
((modm, xK_m), spawn "menu-qalc -- -theme gruvbox-dark"),
|
||||||
, ((modm, xK_i), spawn "rofimoji --selector-args '-theme gruvbox-dark' -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy")
|
((modm, xK_i), spawn "rofimoji --selector-args '-theme gruvbox-dark' -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"),
|
||||||
|
|
||||||
-- screenshotting
|
-- screenshotting
|
||||||
-- TODO: Fix/rewrite window-screenshot.sh
|
-- TODO: Fix/rewrite window-screenshot.sh
|
||||||
, ((modm, xK_w), spawn "window-screenshot.nu")
|
((modm, xK_w), spawn "window-screenshot.nu"),
|
||||||
, ((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots")
|
((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots"),
|
||||||
, ((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots")
|
((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
|
||||||
, ((modm, xK_t), spawn "ocr-screenshot.sh")
|
((modm, xK_t), spawn "ocr-screenshot.sh"),
|
||||||
|
((modm .|. shiftMask, xK_t), spawn "DEVICE=\"MELF0410:00 1FD2:7007\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
|
||||||
, ((modm .|. shiftMask, xK_t), spawn "DEVICE=\"MELF0410:00 1FD2:7007\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi")
|
|
||||||
|
|
||||||
-- Reset the layouts on the current workspace to default
|
-- Reset the layouts on the current workspace to default
|
||||||
-- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
|
-- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
|
||||||
-- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
|
-- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
|
||||||
-- Push window back into tiling
|
-- Push window back into tiling
|
||||||
, ((modm .|. shiftMask, xK_space ), withFocused $ windows . W.sink)
|
((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
|
||||||
|
|
||||||
|
|
||||||
-- Resize viewed windows to the correct size
|
-- Resize viewed windows to the correct size
|
||||||
, ((modm, xK_n ), refresh)
|
((modm, xK_n), refresh),
|
||||||
|
|
||||||
-- Move focus to the next window
|
-- Move focus to the next window
|
||||||
, ((modm, xK_Tab ), layoutPrompt def)
|
((modm, xK_Tab), layoutPrompt def),
|
||||||
|
|
||||||
-- Move focus
|
-- Move focus
|
||||||
, ((modm, xK_j ), windows W.focusDown)
|
((modm, xK_j), windows W.focusDown),
|
||||||
, ((modm, xK_k ), windows W.focusUp )
|
((modm, xK_k), windows W.focusUp),
|
||||||
|
|
||||||
-- Swap the focused window with the next window
|
-- Swap the focused window with the next window
|
||||||
, ((modm .|. shiftMask, xK_j ), windows W.swapDown )
|
((modm .|. shiftMask, xK_j), windows W.swapDown),
|
||||||
, ((modm .|. shiftMask, xK_k ), windows W.swapUp )
|
((modm .|. shiftMask, xK_k), windows W.swapUp),
|
||||||
|
|
||||||
-- Shrink the master area
|
-- Shrink the master area
|
||||||
, ((modm, xK_h ), sendMessage Shrink)
|
((modm, xK_h), sendMessage Shrink),
|
||||||
, ((modm, xK_l ), sendMessage Expand)
|
((modm, xK_l), sendMessage Expand),
|
||||||
|
|
||||||
-- Increment the number of windows in the master area
|
-- Increment the number of windows in the master area
|
||||||
, ((modm , xK_comma ), sendMessage (IncMasterN 1))
|
((modm, xK_comma), sendMessage (IncMasterN 1)),
|
||||||
, ((modm , xK_period), sendMessage (IncMasterN (-1)))
|
((modm, xK_period), sendMessage (IncMasterN (-1)))
|
||||||
|
|
||||||
-- Brightness n stuff
|
-- Brightness n stuff
|
||||||
-- , ((0, xF86XK_AudioRaiseVolume), spawn "amixer -D pulse sset Master 10%+")
|
-- , ((0, xF86XK_AudioRaiseVolume), spawn "amixer -D pulse sset Master 10%+")
|
||||||
-- , ((0, xF86XK_AudioLowerVolume), spawn "amixer -D pulse sset Master 10%-")
|
-- , ((0, xF86XK_AudioLowerVolume), spawn "amixer -D pulse sset Master 10%-")
|
||||||
|
@ -147,14 +133,43 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
|
||||||
-- Run xmessage with a summary of the default keybindings (useful for beginners)
|
-- Run xmessage with a summary of the default keybindings (useful for beginners)
|
||||||
]
|
]
|
||||||
++
|
++
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
--
|
--
|
||||||
-- 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-[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-shift-[1..9], Move client to workspace N
|
||||||
--
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
|
--
|
||||||
[ ((m .|. modm, k), windows $ f i)
|
[ ((m .|. modm, k), windows $ f i)
|
||||||
| (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
|
| (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9],
|
||||||
, (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
|
(f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
|
||||||
|
]
|
||||||
|
|
||||||
-- ++
|
-- ++
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -165,22 +180,27 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
|
||||||
-- | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]
|
-- | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]
|
||||||
-- , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
|
-- , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- 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
|
[ ( (modm, button1),
|
||||||
>> windows W.shiftMaster))
|
\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
|
( (modm, button3),
|
||||||
>> windows W.shiftMaster))
|
\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)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -195,17 +215,19 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
|
||||||
-- The available layouts. Note that each layout is separated by |||,
|
-- The available layouts. Note that each layout is separated by |||,
|
||||||
-- which denotes layout choice.
|
-- which denotes layout choice.
|
||||||
|
|
||||||
tabCfg = def
|
tabCfg =
|
||||||
{ activeColor = "#282828"
|
def
|
||||||
, inactiveColor = "#1d2021"
|
{ activeColor = "#282828",
|
||||||
, urgentColor = "#9d0006"
|
inactiveColor = "#1d2021",
|
||||||
, activeBorderColor = "#504945"
|
urgentColor = "#9d0006",
|
||||||
, inactiveBorderColor = "#3c3836"
|
activeBorderColor = "#504945",
|
||||||
, urgentBorderColor = "#cc241d"
|
inactiveBorderColor = "#3c3836",
|
||||||
, activeTextColor = "#ebdbb2"
|
urgentBorderColor = "#cc241d",
|
||||||
, inactiveTextColor = "#bdae93"
|
activeTextColor = "#ebdbb2",
|
||||||
, urgentTextColor = "#ebdbb2"
|
inactiveTextColor = "#bdae93",
|
||||||
|
urgentTextColor = "#ebdbb2"
|
||||||
}
|
}
|
||||||
|
|
||||||
myLayout = tiled ||| tabbed shrinkText tabCfg ||| Mirror tiled
|
myLayout = tiled ||| tabbed shrinkText tabCfg ||| Mirror tiled
|
||||||
where
|
where
|
||||||
-- default tiling algorithm partitions the screen into two panes
|
-- default tiling algorithm partitions the screen into two panes
|
||||||
|
@ -235,16 +257,19 @@ myLayout = tiled ||| tabbed shrinkText tabCfg ||| Mirror tiled
|
||||||
-- 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 =
|
||||||
[ className =? "MPlayer" --> doFloat
|
composeAll
|
||||||
, className =? "Gimp" --> doFloat
|
[ className =? "MPlayer" --> doFloat,
|
||||||
, resource =? "desktop_window" --> doIgnore
|
className =? "Gimp" --> doFloat,
|
||||||
, resource =? "kdesktop" --> doIgnore ]
|
resource =? "desktop_window" --> doIgnore,
|
||||||
|
resource =? "kdesktop" --> doIgnore
|
||||||
|
]
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- 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
|
||||||
|
@ -282,14 +307,13 @@ myStartupHook = do
|
||||||
spawn "feh --bg-fill ~/Pictures/wallpaper.jpg"
|
spawn "feh --bg-fill ~/Pictures/wallpaper.jpg"
|
||||||
setDefaultKeyRemap myRemaps [myRemaps]
|
setDefaultKeyRemap myRemaps [myRemaps]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
-- Now run xmonad with all the defaults we set up.
|
-- Now run xmonad with all the defaults we set up.
|
||||||
|
|
||||||
-- Run xmonad with the settings you specify. No need to modify this.
|
-- Run xmonad with the settings you specify. No need to modify this.
|
||||||
--
|
--
|
||||||
mySB = statusBarProp "polybar" (pure xmobarPP)
|
mySB = statusBarProp "polybar" (pure xmobarPP)
|
||||||
|
|
||||||
main = xmonad $ withEasySB mySB defToggleStrutsKey (ewmh defaults)
|
main = xmonad $ withEasySB mySB defToggleStrutsKey (ewmh defaults)
|
||||||
|
|
||||||
-- A structure containing your configuration settings, overriding
|
-- A structure containing your configuration settings, overriding
|
||||||
|
@ -298,24 +322,25 @@ main = xmonad $ withEasySB mySB defToggleStrutsKey (ewmh defaults)
|
||||||
--
|
--
|
||||||
-- No need to modify this.
|
-- No need to modify this.
|
||||||
--
|
--
|
||||||
defaults = def
|
defaults =
|
||||||
-- simple stuff
|
def
|
||||||
{ terminal = myTerminal
|
{ -- simple stuff
|
||||||
, focusFollowsMouse = myFocusFollowsMouse
|
terminal = myTerminal,
|
||||||
, clickJustFocuses = myClickJustFocuses
|
focusFollowsMouse = myFocusFollowsMouse,
|
||||||
, borderWidth = myBorderWidth
|
clickJustFocuses = myClickJustFocuses,
|
||||||
, modMask = myModMask
|
borderWidth = myBorderWidth,
|
||||||
, workspaces = myWorkspaces
|
modMask = myModMask,
|
||||||
, normalBorderColor = myNormalBorderColor
|
workspaces = myWorkspaces,
|
||||||
, focusedBorderColor = myFocusedBorderColor
|
normalBorderColor = myNormalBorderColor,
|
||||||
|
focusedBorderColor = myFocusedBorderColor,
|
||||||
-- , clientMask = focusChangeMask .|. XMonad.clientMask
|
-- , clientMask = focusChangeMask .|. XMonad.clientMask
|
||||||
-- key bindings
|
-- key bindings
|
||||||
, keys = myKeys
|
keys = myKeys,
|
||||||
, mouseBindings = myMouseBindings
|
mouseBindings = myMouseBindings,
|
||||||
-- hooks, layouts
|
-- hooks, layouts
|
||||||
, layoutHook = spacingRaw True (Border 0 0 0 0) True (Border 7 7 7 7) True $ myLayout
|
layoutHook = spacingRaw True (Border 0 0 0 0) True (Border 7 7 7 7) True myLayout,
|
||||||
, manageHook = myManageHook
|
manageHook = myManageHook,
|
||||||
, handleEventHook = myEventHook
|
handleEventHook = myEventHook,
|
||||||
, logHook = myLogHook
|
logHook = myLogHook,
|
||||||
, startupHook = myStartupHook
|
startupHook = myStartupHook
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue