1
0
Fork 0
mirror of https://github.com/Horhik/dotfiles.git synced 2024-11-22 08:21:27 +00:00

update xmonad

This commit is contained in:
Horhik 2022-08-04 19:27:36 +03:00
parent f520434bc7
commit cdfcdbd6b5
4 changed files with 39 additions and 39 deletions

View file

@ -17,7 +17,7 @@ Config {
, sepChar = "%" -- delineator between plugin names and straight text , sepChar = "%" -- delineator between plugin names and straight text
, alignSep = "][" -- separator between left-right alignment , alignSep = "][" -- separator between left-right alignment
, template = "<fc=#83a598>——{</fc>%StdinReader%<fc=#83a598>}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————</fc>][%/home/horhik/.config/xmobar/bin/xmobarstatus%" , template = "<fc=#83a598>——{</fc>%StdinReader%<fc=#83a598>}———————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————</fc>][%/home/horhik/.config/xmobar/bin/xmobarstatus%"
-- general behavior -- general behavior
, lowerOnStart = False -- send to bottom of window stack on start , lowerOnStart = False -- send to bottom of window stack on start

View file

@ -16,7 +16,7 @@
-- layout -- layout
, sepChar = "%" -- delineator between plugin names and straight text , sepChar = "%" -- delineator between plugin names and straight text
, alignSep = "][" -- separator between left-right alignment , alignSep = "][" -- separator between left-right alignment
, template = "<fc=#a89984>--{</fc>%StdinReader%<fc=#a89984>}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————</fc>][%/home/horhik/.config/xmobar/bin/xmobarstatus2%" , template = "<fc=#a89984>--{</fc>%StdinReader%<fc=#a89984>}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————</fc>][%/home/horhik/.config/xmobar/bin/xmobarstatus2%"
-- general behavior -- general behavior
, lowerOnStart = False -- send to bottom of window stack on start , lowerOnStart = False -- send to bottom of window stack on start

1
home/xmonad/.xmonad/xmonad.errors Executable file → Normal file
View file

@ -0,0 +1 @@
$ ghc --make xmonad.hs -i -ilib -fforce-recomp -main-is main -v0 -outputdir /home/horhik/.xmonad/build-x86_64-linux -o /home/horhik/.xmonad/xmonad-x86_64-linux

View file

@ -30,7 +30,6 @@ import XMonad.Layout.NoBorders (noBorders, smartBorders)
import XMonad.Hooks.DynamicLog import XMonad.Hooks.DynamicLog
import XMonad.Util.Scratchpad import XMonad.Util.Scratchpad
import XMonad.Util.NamedScratchpad import XMonad.Util.NamedScratchpad
import XMonad.Util.Brightness as Bright
-- Layouts -- Layouts
import XMonad.Layout.Accordion import XMonad.Layout.Accordion
@ -58,13 +57,12 @@ import qualified XMonad.Layout.ToggleLayouts as T (toggleLayouts, ToggleLayout(T
import qualified XMonad.Layout.MultiToggle as MT (Toggle(..)) import qualified XMonad.Layout.MultiToggle as MT (Toggle(..))
import qualified Graphics.X11.ExtraTypes.XF86 as XF86 -- import Graphics.X11.ExtraTypes.XF86 as XF86
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import qualified Data.Map as M import qualified Data.Map as M
import GruvboxColors as Colors import GruvboxColors as Colors
import TaskMonad
home = "/home/horhik/" home = "/home/horhik/"
@ -100,7 +98,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-- launch dmenu -- launch dmenu
-- , ((modm, xK_p ), spawn ("dmenu_run " ++ " -fn '" ++ myDmenuFont ++ "' -nb '" ++ backgroundColor ++ "' -nf '" ++ selectionColor ++ "' -sb '"++ selectionColor ++"' -sf '"++foregroundSecondColor++"' -shb '"++ greenDarkerColor ++ "' -c "++" -l "++" 20 ")) -- , ((modm, xK_p ), spawn ("dmenu_run " ++ " -fn '" ++ myDmenuFont ++ "' -nb '" ++ backgroundColor ++ "' -nf '" ++ selectionColor ++ "' -sb '"++ selectionColor ++"' -sf '"++foregroundSecondColor++"' -shb '"++ greenDarkerColor ++ "' -c "++" -l "++" 20 "))
-- launch emoji picker -- launch emoji picker
, ((modm , xK_e ), spawn "rofimoji") , ((modm , xK_e ), spawn "rofi -show emoji")
, ((modm , xK_p ), spawn "rofi -show drun") , ((modm , xK_p ), spawn "rofi -show drun")
, ((modm .|. shiftMask , xK_p ), spawn "rofi-pass") , ((modm .|. shiftMask , xK_p ), spawn "rofi-pass")
@ -109,7 +107,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, ((modm .|. shiftMask, xK_c ), kill) , ((modm .|. shiftMask, xK_c ), kill)
-- Rotate through the available layout algorithms -- Rotate through the available layout algorithms
, ((modm, xK_space ), sendMessage NextLayout) , ((controlMask, xK_Control_R ), sendMessage NextLayout)
-- 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)
@ -177,9 +175,9 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-- flameshot gui -- flameshot gui
, ((modm .|. shiftMask, xK_s ), spawn "flameshot gui") , ((modm .|. shiftMask, xK_s ), spawn "flameshot gui")
, ((modm .|. mod1Mask , xK_space ), spawn "$HOME/.local/scripts/deadd_notify") --, ((modm .|. mod1Mask , xK_space ), spawn "$HOME/.local/scripts/deadd_notify")
-- change lang -- change lang
, ((modm, xK_Control_R) , spawn "setxkbmap us,ru; xkb-switch -n") , ((modm, xK_space) , spawn "setxkbmap us,ru; xkb-switch -n")
, ((modm, xK_Shift_R) , spawn "xkb-switch -n") , ((modm, xK_Shift_R) , spawn "xkb-switch -n")
, ((modm, xK_d) , spawn "eww-toggl") , ((modm, xK_d) , spawn "eww-toggl")
-- toggle fullscreen -- toggle fullscreen
@ -192,8 +190,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse") , ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse")
, ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist") , ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist")
, ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "rss_news") , ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "rss_news")
, ((modm .|. controlMask, xK_e), namedScratchpadAction myScratchpads "emacs") , ((modm .|. shiftMask, xK_d), namedScratchpadAction myScratchpads "emacs")
, ((modm , xK_w), taskwarriorPrompt [(\x -> x == "processInbox", processInbox)])
-- | Programs -- | Programs
, ((modm .|. shiftMask, xK_z), spawn "zathura &") -- book reader (zathura) , ((modm .|. shiftMask, xK_z), spawn "zathura &") -- book reader (zathura)
@ -227,13 +224,12 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
++ ++
[ ((0, XF86.xF86XK_MonBrightnessUp ), Bright.increase) [
, ((0, XF86.xF86XK_MonBrightnessDown), Bright.decrease) --((0, XF86.xF86XK_AudioPause ), spawn "playerctl play-pause")
, ((0, XF86.xF86XK_AudioPause ), spawn "playerctl play-pause") --, ((0, XF86.xF86XK_AudioPrev ), spawn "playerctl previous")
, ((0, XF86.xF86XK_AudioPrev ), spawn "playerctl previous") --, ((0, XF86.xF86XK_AudioMute ), spawn "pulsemixer --toggle-mute")
, ((0, XF86.xF86XK_AudioMute ), spawn "pulsemixer --toggle-mute") --, ((0, XF86.xF86XK_AudioLowerVolume ), spawn "pulsemixer --set-volume $(($(pulsemixer --get-volume | cut -d ' ' -f 1) - 5))")
, ((0, XF86.xF86XK_AudioLowerVolume ), spawn "pulsemixer --set-volume $(($(pulsemixer --get-volume | cut -d ' ' -f 1) - 5))") --, ((0, XF86.xF86XK_AudioRaiseVolume ), spawn "pulsemixer --set-volume $(($(pulsemixer --get-volume | cut -d ' ' -f 1) + 5))")
, ((0, XF86.xF86XK_AudioRaiseVolume ), spawn "pulsemixer --set-volume $(($(pulsemixer --get-volume | cut -d ' ' -f 1) + 5))")
] ]
@ -398,7 +394,6 @@ myManageHook = (composeAll
, resource =? "kdesktop" --> doIgnore , resource =? "kdesktop" --> doIgnore
]) ])
<+> namedScratchpadManageHook myScratchpads <+> namedScratchpadManageHook myScratchpads
<+> namedScratchpadManageHook taskwarriorScratchpads
where where
doCenter = customFloating $ W.RationalRect l t w h doCenter = customFloating $ W.RationalRect l t w h
where where
@ -555,26 +550,30 @@ myLogHook (xmproc0, xmproc1) = dynamicLogWithPP $ xmobarPP { -- XMobar
-- --
-- By default, do nothing. -- By default, do nothing.
myStartupHook = do myStartupHook = do
spawnOnce "nitrogen --restore &" spawnOnce "/home/horhik/.local/scripts/autostart.sh"
-- spawnOnce "compton --config ~/.config/compton/compton.conf &" -- spawnOnce "picom &"
spawnOnce "picom --experimental-backends &" -- -- spawnOnce "compton --config ~/.config/compton/compton.conf &"
spawnOnce "setxkbmap us,ru &" -- spawnOnce "setxkbmap us,ru &"
spawnOnce "eww daemon" -- spawnOnce "kill $(pidof pulseaudio) ; pipewire &; pipewire-pulse &"
spawnOnce "nextcloud" -- spawnOnce "kill $(pidof pulseaudio) ; pipewire &; pipewire-pulse &"
spawnOnce "thunderbird" -- spawnOnce "/home/horhik/.local/scripts/pipewire-mazafaka.sh"
spawnOnce "superproductivity" -- spawnOnce "nitromegen --restore"
spawnOnce "syncthing" -- --spawnOnce "eww daemon"
spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch" -- spawnOnce "nextcloud &"
spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa" -- spawnOnce "thunderbird &"
spawnOnce ("$HOME/.cargo/bin/enact --watch --pos left") -- --spawnOnce "superproductivity"
spawnOnce ("sleep 1; $HOME/.cargo/bin/enact --pos left") -- spawnOnce "syncthing &"
-- spawnOnce ("xrandr --output HDMI1 --left-of eDP1&") -- --spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch"
spawnOnce (home ++ ".local/scripts/status/launch &") -- --spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa"
spawnOnce (home ++ ".local/scripts/touchpad.sh &") -- --spawnOnce ("$HOME/.cargo/bin/enact --watch --pos left")
-- spawnOnce ("cd /home/horhik/Freenet/downloads/fms; ./fms --daemon &") -- --spawnOnce ("sleep 1; $HOME/.cargo/bin/enact --pos left")
spawnOnce "xautolock -time 25 -locker i3lock-fancy-multimonitor -notifier 'xkb-switch -s us' &" -- -- spawnOnce ("xrandr --output HDMI1 --left-of eDP1&")
spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa &" -- --spawnOnce (home ++ ".local/scripts/status/launch &")
spawnOnce "xrandr --output HDMI-A-0 --right-of eDP &" -- --spawnOnce (home ++ ".local/scripts/touchpad.sh &")
-- -- spawnOnce ("cd /home/horhik/Freenet/downloads/fms; ./fms --daemon &")
-- --spawnOnce "xautolock -time 25 -locker i3lock-fancy-multimonitor -notifier 'xkb-switch -s us' &"
-- spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa &"
-- spawnOnce "xrandr --output HDMI-A-0 --right-of eDP &"
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- Now run xmonad with all the defaults we set up. -- Now run xmonad with all the defaults we set up.