diff --git a/home/xmonad/.config/xmobar/bin/xmobarstatus b/home/xmonad/.config/xmobar/bin/xmobarstatus new file mode 100755 index 0000000..d9adfa1 --- /dev/null +++ b/home/xmonad/.config/xmobar/bin/xmobarstatus @@ -0,0 +1,106 @@ +#!/bin/bash + +module GruvboxColors where + +backgroundColor="#282828" +currentLineColor="#fabd2f" +selectionColor="#665c54" +foregroundColor="#ebdbb2" +foregroundSecondColor="#fbf1c1" +commentColor="#458588" +cyanColor="#83a598" +greenColor="#8ec07c" +greenDarkerColor="#689d6a" +orangeColor="#fe8019" +pinkColor="#d3869b" +purpleColor="#b16286" +redColor="#cc241d" +yellowColor="#fabd2f" + + + + +battery () +{ +val=$(acpi | grep -oh "[[:digit:]]*%" | grep -oh "[0-9]*") + +case $val in + [1-9][0-9][0-9]) + echo "-{ $val%}" + ;; + [5-9][0-9]) + echo "-{ $val%}" + ;; +[1-4][0-9]) + echo "-{ $val%}" + ;; +[1-9]) + echo " $val%" + echo "-{ $val%}" + ;; +0) + echo " " + ;; +*) + echo "-{ $val%}" + ;; +esac +} + + +volume () +{ + #maybe change to Right, Left, Mono +val=$(amixer sget Master | grep 'Left:' | awk -F'[][]' '{ print $2 }'| grep -oh "[0-9]*") +case $val in + 100) + echo "-{ $val%}" +;; + [5-9][0-9]) + echo "-{ $val%}" + ;; +[1-4][0-9]) + echo "-{ $val%}" + ;; +[1-9]) + echo "-{ $val%}" + ;; +0) + echo "-{}" + ;; +*) + echo "-{ $val%}" +esac +} + +diskspace () +{ + #might be another /dev/sda... + echo "-{ "$(df -h | grep sda2 | grep -oh "[0-9]*%") "}" +} +wifi () +{ + name=$(connmanctl services | grep "*A" | grep -oh "^*A. [A-Za-z]*" | grep -oh "[[:space:]][A-Za-x]*" | head -n 1) +if [ $name != " " ]; + then + echo "-{ $name}" + else + echo 睊 off + fi +} +layout () +{ + echo "-{ "$(xkblayout-state print %s)"}" +} +timeanddate () +{ + echo "-{" "$(date +'%T')}" +} +calendar () +{ + echo " "$(date +'%d/%m/%Y') +} + +echo "$(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 e1c1f64..413b580 100644 --- a/home/xmonad/.config/xmobar/config.hs +++ b/home/xmonad/.config/xmobar/config.hs @@ -52,7 +52,7 @@ Config { , "--High" , "5000" -- units: B/s , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- cpu activity monitor @@ -61,7 +61,7 @@ Config { , "--High" , "85" -- units: % , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- cpu core temperature monitor @@ -70,7 +70,7 @@ Config { , "--High" , "80" -- units: °C , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 50 -- memory usage monitor @@ -79,7 +79,7 @@ Config { , "--High" , "90" -- units: % , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- battery monitor @@ -105,7 +105,7 @@ Config { -- keyboard layout indicator , Run Kbd [ ("us" , "EN") - , ("ru" , "RU") + , ("ru" , "RU") ] , Run StdinReader , Run Brightness diff --git a/home/xmonad/.config/xmobar/config_second.hs b/home/xmonad/.config/xmobar/config_second.hs index e1c1f64..276ad20 100644 --- a/home/xmonad/.config/xmobar/config_second.hs +++ b/home/xmonad/.config/xmobar/config_second.hs @@ -1,10 +1,10 @@ Config { -- appearance - font = "xft:Mononoki-11:bold:antialias=true:hinting=true" + font = "xft:Mononoki Nerd Font-14:bold:antialias=true:hinting=true" , additionalFonts = [ - "xft:Fira Code-10:bold:antialias=true:hinting=True" - , "xft:Mononoki-10:bold:antialias=true:hinting=True" + "xft:EmojiOne:bold:antialias=true:hinting=true" + ,"xft:FontAwesome:bold:antialias=true:hinting=true" ] , bgColor = "#282828" , fgColor = "#ebdbb2" @@ -16,7 +16,7 @@ Config { -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "][" -- separator between left-right alignment - , template = "--{%StdinReader%}---------------------------------------------------------------------------------------------------------------------------------][{ %coretemp%}-{ %memory% }-{ %dynnetwork% }-{ %battery%}-{ %date% }-{ %kbd% }--" + , template = "--{%StdinReader%}---------------------------------------------------------------------------------------------------------------------------------][%xmobarstatus%" -- general behavior , lowerOnStart = False -- send to bottom of window stack on start @@ -45,6 +45,7 @@ Config { -- weather monitor [ Run Weather "RJTT" [ "--template", " | °C | % | hPa" ] 36000 + , Run Com "xmobarstatus" [] "" 10 -- network activity monitor (dynamic interface resolution) , Run DynNetwork [ "--template" , ": kB/s|kB/s" @@ -52,7 +53,7 @@ Config { , "--High" , "5000" -- units: B/s , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- cpu activity monitor @@ -61,7 +62,7 @@ Config { , "--High" , "85" -- units: % , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- cpu core temperature monitor @@ -70,7 +71,7 @@ Config { , "--High" , "80" -- units: °C , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 50 -- memory usage monitor @@ -79,7 +80,7 @@ Config { , "--High" , "90" -- units: % , "--low" , "#8ec07c" , "--normal" , "#fabd2f" - , "--high" , "#cc241d" + , "--high" , "#fb4934" ] 10 -- battery monitor @@ -105,7 +106,7 @@ Config { -- keyboard layout indicator , Run Kbd [ ("us" , "EN") - , ("ru" , "RU") + , ("ru" , "RU") ] , Run StdinReader , Run Brightness diff --git a/home/xmonad/.xmonad/xmonad-x86_64-linux b/home/xmonad/.xmonad/xmonad-x86_64-linux index 6ad04ea..e0739cc 100755 Binary files a/home/xmonad/.xmonad/xmonad-x86_64-linux and b/home/xmonad/.xmonad/xmonad-x86_64-linux differ diff --git a/home/xmonad/.xmonad/xmonad.hs b/home/xmonad/.xmonad/xmonad.hs index 98376db..2e3b6af 100644 --- a/home/xmonad/.xmonad/xmonad.hs +++ b/home/xmonad/.xmonad/xmonad.hs @@ -141,6 +141,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- flameshot gui , ((modm .|. shiftMask, xK_s ), spawn "flameshot gui") + , ((modm .|. controlMask, xK_space ), spawn "$HOME/.local/scripts/deadd_notify") -- change lang , ((controlMask , xK_space ), spawn "setxkbmap -layout fi,ru,us; xkb-switch -n") -- toggle fullscreen @@ -151,12 +152,14 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm .|. controlMask .|. shiftMask, xK_h), namedScratchpadAction myScratchpads "htop") , ((modm .|. shiftMask , xK_a), namedScratchpadAction myScratchpads "anki") , ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse") + , ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist") + , ((modm .|. shiftMask , xK_e), namedScratchpadAction myScratchpads "pomo") -- | Programs - , ((modm .|. shiftMask, xK_z), spawn "zathura &") -- book reader (zathura) - , ((modm .|. shiftMask, xK_b), spawn "firefox" ) -- browser + , ((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) - , ((modm .|. shiftMask, xK_n), spawn "firefox --new-tab https://www.notion.so/horhi ") -- noteapp + , ((modm .|. shiftMask, xK_n), spawn "firefox --new-tab https://www.notion.so/horhi ") -- noteapp @@ -182,7 +185,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 -- [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f)) - | (key, sc) <- zip [xK_less, xK_greater, xK_r] [0..] + | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..] , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] ++ @@ -280,9 +283,11 @@ myManageHook = (composeAll myScratchpads = [ NS "terminal" spawnTerm findTerm manageTerm - , NS "htop" "xterm -e htop" (title =? "htop") defaultFloating + , NS "htop" "alacritty -t htop -e htop " (title =? "htop") defaultFloating + , NS "pomo" "pomodone" (title =? "PomoDoneApp") defaultFloating , NS "anki" spawnAnki findAnki manageAnki , NS "pulse" spawnPulse findPulse managePulse + , NS "todoist" spawnTodoist findTodoist manageTodoist ] where classTerm = "TerminalDropdown" @@ -315,6 +320,18 @@ myScratchpads = [ t = (1 - h) / 2 -- bottom edge l = (1 - w) / 2 -- centered left/right + classTodoist = "TodoistDropdown" + titleTodoist = "Todoist" + spawnTodoist = "todoist" + findTodoist = title =? titleTodoist + manageTodoist = customFloating $ W.RationalRect l t w h + where + h = 0.7 -- height, 50% + w = 0.4 -- width, 50% + t = (1 - h) / 2 -- bottom edge + l = (1 - w) / 2 -- centered left/right + + ------------------------------------------------------------------------ @@ -369,6 +386,7 @@ myStartupHook = do spawnOnce "nitrogen --restore &" -- spawnOnce "compton --config ~/.config/compton/compton.conf &" spawnOnce "picom &" + spawnOnce "deadd-notification-center" spawnOnce "setxkbmap us,ru, grp:alt_shift_toggle" spawnOnce "$HOME/Scripts/startup/touchpad.sh" spawnOnce "sh ssh-agent bash ; ssh-add ~/.ssh/arch" diff --git a/home/xmonad/.xmonad/xmonad.o b/home/xmonad/.xmonad/xmonad.o index d431b68..186db39 100644 Binary files a/home/xmonad/.xmonad/xmonad.o and b/home/xmonad/.xmonad/xmonad.o differ