diff --git a/README.md b/README.md index 132bef0..5002dc2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LeftWM themes - Coffee. +# LeftWM themes - Coffee If you want to use them copy them into: ~/.config/leftwm/themes @@ -11,4 +11,4 @@ cp THEME_FROM_THIS_REPO . ln -s THEME_NAME current ``` -![](https://github.com/leftwm/leftwm-coffee/raw/master/screenshot.jpg) +![](https://github.com/lex148/leftwm-coffee/raw/master/screenshot.jpg) diff --git a/polybar.config b/polybar.config index 2cc58f4..4e24b89 100644 --- a/polybar.config +++ b/polybar.config @@ -26,6 +26,7 @@ secondary = #7A736D alert = #9D7153 [bar/mainbar] +bottom = true monitor = ${env:MONITOR} width = 100% height = 27 @@ -43,9 +44,10 @@ module-margin-right = 2 font-0 = misc fixed:pixelsize=10;1 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 font-2 = wuncon siji:pixelsize=10;1 +font-3 = Weather Icons:size=12;1 modules-left = ewmh modules-center = -modules-right = filesystem xbacklight pulseaudio xkeyboard memory cpu wlan eth battery temperature date powermenu +modules-right = pulseaudio polypomo xkeyboard memory cpu temperature date powermenu tray-position = right tray-padding = 2 cursor-click = pointer @@ -97,79 +99,6 @@ label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%% label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.foreground-alt} -[module/bspwm] -type = internal/bspwm - -label-focused = %index% -label-focused-background = ${colors.background-alt} -label-focused-underline= ${colors.primary} -label-focused-padding = 2 - -label-occupied = %index% -label-occupied-padding = 2 - -label-urgent = %index%! -label-urgent-background = ${colors.alert} -label-urgent-padding = 2 - -label-empty = %index% -label-empty-foreground = ${colors.foreground-alt} -label-empty-padding = 2 - -; Separator in between workspaces -; label-separator = | - -[module/i3] -type = internal/i3 -format = -index-sort = true -wrapping-scroll = false - -; Only show workspaces on the same output as the bar -;pin-workspaces = true - -label-mode-padding = 2 -label-mode-foreground = #000 -label-mode-background = ${colors.primary} - -; focused = Active workspace on focused monitor -label-focused = %index% -label-focused-background = ${module/bspwm.label-focused-background} -label-focused-underline = ${module/bspwm.label-focused-underline} -label-focused-padding = ${module/bspwm.label-focused-padding} - -; unfocused = Inactive workspace on any monitor -label-unfocused = %index% -label-unfocused-padding = ${module/bspwm.label-occupied-padding} - -; visible = Active workspace on unfocused monitor -label-visible = %index% -label-visible-background = ${self.label-focused-background} -label-visible-underline = ${self.label-focused-underline} -label-visible-padding = ${self.label-focused-padding} - -; urgent = Workspace with urgency hint set -label-urgent = %index% -label-urgent-background = ${module/bspwm.label-urgent-background} -label-urgent-padding = ${module/bspwm.label-urgent-padding} - -; Separator in between workspaces -; label-separator = | - - -[module/mpd] -type = internal/mpd -format-online = - -icon-prev =  -icon-stop =  -icon-play =  -icon-pause =  -icon-next =  - -label-song-maxlen = 25 -label-song-ellipsis = true - [module/xbacklight] type = internal/xbacklight @@ -248,8 +177,8 @@ format-disconnected = [module/date] type = internal/date -date = %m/%d/%Y%%{F-} %%{F#fff}%I:%M %p%{F-} -date-alt = %%{F#fff}%A, %B %d, %Y %%{F#fff}%I:%M %p%{F#666}%%{F#fba922}%S%%{F-} +date = %d.%m.%Y%%{F-} %%{F#fff}%H:%M +date-alt = %%{F#fff}%A, %B %d, %Y %%{F#fff}%H:%M format-underline = #9D7153 [module/pulseaudio] @@ -388,6 +317,28 @@ menu-2-0-exec = sudo poweroff menu-2-1 = cancel menu-2-1-exec = menu-open-0 +[module/polypomo] +type = custom/script + +exec = /home/alexander/.config/polybar/polypomo +tail = true + +label = %output% +click-left = /home/alexander/.config/polybar/polypomo toggle +click-right = /home/alexander/.config/polybar/polypomo end +click-middle = /home/alexander/.config/polybar/polypomo lock +scroll-up = /home/alexander/.config/polybar/polypomo time +60 +scroll-down = /home/alexander/.config/polybar/polypomo time -60 + +font-0 = fixed:pixelsize=10;1 +font-1 = Noto Emoji:scale=15:antialias=false;0 + +[module/weather] +type = custom/script +exec = /home/alexander/.config/polybar/openweathermap-fullfeatured/openweathermap-fullfeatured.sh +interval = 600 +label-font = 3 + [settings] screenchange-reload = true ;compositing-background = xor @@ -396,8 +347,8 @@ screenchange-reload = true ;compositing-border = over ;pseudo-transparency = false -;[global/wm] -;margin-top = 5 -;margin-bottom = 5 +[global/wm] +margin-top = 0 +margin-bottom = 0 ; vim:ft=dosini diff --git a/screenshot.jpg b/screenshot.jpg deleted file mode 100644 index 2ba90a5..0000000 Binary files a/screenshot.jpg and /dev/null differ diff --git a/theme.toml b/theme.toml index d23b587..c95308e 100644 --- a/theme.toml +++ b/theme.toml @@ -1,5 +1,6 @@ -border_width = 2 -margin = 20 +border_width = 0 +workspace_margin = 0 +margin = 0 default_border_color = "#4A433D" floating_border_color = "#E6E5E5" focused_border_color = "#9D7153" diff --git a/up b/up index 48adb33..4997ad6 100755 --- a/up +++ b/up @@ -1,26 +1,42 @@ #!/bin/bash SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -SCRIPTPATH/down +$SCRIPTPATH/down + +xrandr --output DP-2 --set "max bpc" 10 --dpi 157 --scale 1x1 --pos 0x0 --primary --output DP-3 --pos 3840x1392 --dpi 72 --scale 1x1 +/home/alexander/bin/wallpaper #boot compton if it exists -if [ -x "$(command -v compton)" ]; then - compton &> /dev/null & +if [ -x "$(command -v picom)" ]; then + picom &> /dev/null & + #xrdb -load /home/alexander/.Xresources + xrdb -merge $SCRIPTPATH/Xresources +fi +if [ -x "$(command -v clipmenud)" ]; then + #setxkbmap -layout 'us,ru' -option 'lv3:ralt_switch,grp:caps_toggle,misc:typo,grp_led:scroll,compose:rctrl' &> /dev/null + #xmodmap ~/.xmodmaprc &> /dev/null & + systemctl --user start kbdsetup + systemctl --user start clipmenud fi #set background -if [ -x "$(command -v xwinwrap)" ]; then - xwinwrap -ov -g 1920x1080+0+0 -- mpv -wid WID $SCRIPTPATH/background.mp4 --no-osc --no-osd-bar --loop-file --player-operation-mode=cplayer --no-audio --panscan=1.0 --no-input-default-bindings & -fi +#if [ -x "$(command -v xwinwrap)" ]; then +# xwinwrap -ov -g 1920x1080+0+0 -- mpv -wid WID $SCRIPTPATH/background.mp4 --no-osc --no-osd-bar --loop-file --player-operation-mode=cplayer --no-audio --panscan=1.0 --no-input-default-bindings & +#fi -echo "LoadTheme $SCRIPTPATH/theme.toml" > $XDG_RUNTIME_DIR/leftwm/commands.pipe +echo "LoadTheme $SCRIPTPATH/theme.toml" > $XDG_RUNTIME_DIR/leftwm/command-0.pipe +# leftwm command "LoadTheme $SCRIPTPATH" #boot polybar based on the number of monitors found if [ -x "$(command -v polybar)" ]; then pkill polybar - monitors="$(polybar -m | sed s/:.*// | tac)" - while read -r display; do - MONITOR=$display polybar -c "$SCRIPTPATH/polybar.config" mainbar &> /dev/null & - done <<< "$monitors" + #monitors="$(polybar -m | sed s/:.*// | tac)" + polybar -c "$HOME/.config/polybar/polybar.config" mainbar &> /dev/null & + #while read -r display; do + # MONITOR=$display polybar -c "$SCRIPTPATH/polybar.config" mainbar &> /dev/null & + #done <<< "$monitors" exit 0 fi + +systemctl --user start wired || true +leftwm-command "SoftReload"