diff --git a/home/xmonad/.config/xmobar/bin/xmobarstatus b/home/xmonad/.config/xmobar/bin/xmobarstatus index 8aa74d2..016347b 100755 --- a/home/xmonad/.config/xmobar/bin/xmobarstatus +++ b/home/xmonad/.config/xmobar/bin/xmobarstatus @@ -113,6 +113,7 @@ echo "—{$toggl_description("$duration"—{$(calendar)}—-" +echo "$(toggl_timer)$(wifi)$(battery)$(volume)$(layout)$(diskspace)$(timeanddate)—{$(calendar)}——" #echo "                                          " + diff --git a/home/xmonad/.config/xmobar/config.hs b/home/xmonad/.config/xmobar/config.hs index 3b432ac..eafc5d1 100644 --- a/home/xmonad/.config/xmobar/config.hs +++ b/home/xmonad/.config/xmobar/config.hs @@ -17,7 +17,7 @@ Config { , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "][" -- separator between left-right alignment - , template = "——{%StdinReader%}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus%" + , template = "——{%StdinReader%}—————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————————][%xmobarstatus%" -- general behavior , lowerOnStart = False -- send to bottom of window stack on start diff --git a/home/xmonad/.config/xmobar/lib/GruvboxColors.hs b/home/xmonad/.config/xmobar/lib/GruvboxColors.hs index 4c0d1c5..e002f63 100644 --- a/home/xmonad/.config/xmobar/lib/GruvboxColors.hs +++ b/home/xmonad/.config/xmobar/lib/GruvboxColors.hs @@ -7,8 +7,8 @@ foregroundColor = "#ebdbb2" foregroundSecondColor = "#fbf1c1" commentColor = "#458588" cyanColor = "#83a598" -greenColor = "#8ec07c" -greenDarkerColor = "#689d6a" +greenColor = "#98971a" +greenDarkerColor = "#98971a" orangeColor = "#fe8019" pinkColor = "#d3869b" purpleColor = "#b16286" diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.hs b/home/xmonad/.xmonad/lib/GruvboxColors.hs index 4c0d1c5..977579a 100644 --- a/home/xmonad/.xmonad/lib/GruvboxColors.hs +++ b/home/xmonad/.xmonad/lib/GruvboxColors.hs @@ -7,11 +7,11 @@ foregroundColor = "#ebdbb2" foregroundSecondColor = "#fbf1c1" commentColor = "#458588" cyanColor = "#83a598" -greenColor = "#8ec07c" -greenDarkerColor = "#689d6a" -orangeColor = "#fe8019" +greenColor = "#98971a" +greenDarkerColor = "#98971a" +orangeColor = "#fabd2f" pinkColor = "#d3869b" -purpleColor = "#b16286" +purpleColor = "#83a598" redColor = "#cc241d" yellowColor = "#fabd2f" grayColor = "#a89984" diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.o b/home/xmonad/.xmonad/lib/GruvboxColors.o deleted file mode 100644 index c5d51d6..0000000 Binary files a/home/xmonad/.xmonad/lib/GruvboxColors.o and /dev/null differ diff --git a/home/xmonad/.xmonad/xmonad.hs b/home/xmonad/.xmonad/xmonad.hs index 067ad91..a33d9a3 100644 --- a/home/xmonad/.xmonad/xmonad.hs +++ b/home/xmonad/.xmonad/xmonad.hs @@ -158,11 +158,11 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse") , ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "notion") , ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist") + , ((modm .|. controlMask, xK_e), namedScratchpadAction myScratchpads "emacs") -- | Programs , ((modm .|. shiftMask, xK_z), spawn "zathura &") -- book reader (zathura) , ((modm .|. shiftMask, xK_b), spawn "firefox" ) -- browser - , ((modm .|. controlMask, xK_e), spawn "/usr/bin/emacs &" ) -- editor (emacs) @@ -292,6 +292,7 @@ myScratchpads = [ , NS "anki" spawnAnki findAnki manageAnki , NS "pulse" spawnPulse findPulse managePulse , NS "todoist" spawnTodoist findTodoist manageTodoist + , NS "emacs" spawnEmacs findEmacs manageEmacs ] where classTerm = "TerminalDropdown" @@ -335,6 +336,19 @@ myScratchpads = [ t = (1 - h) / 2 -- bottom edge l = (1 - w) / 2 -- centered left/right + classEmacs = "EmacsDropDown" + titleEmacs = "emacs@dropdown" + spawnEmacs = "emacs --title emacs@dropdown " + findEmacs = title =? titleEmacs + manageEmacs = customFloating $ W.RationalRect l t w h + where + h = 0.7 -- height, 50% + w = 0.6 -- width, 50% + t = (1 - h) / 2 -- bottom edge + l = (1 - w) / 2 -- centered left/right + + + @@ -394,6 +408,7 @@ myStartupHook = do spawnOnce "setxkbmap us,ru &" spawnOnce "eww daemon" spawnOnce "nextcloud" + spawnOnce "syncthing" spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch" spawnOnce "eval '$(ssh-agent -s)'; ssh-add ~/.ssh/id_rsa" spawnOnce ("enact --pos left --watch &")