diff --git a/dot/file/profile b/dot/file/profile index e443dbb..8e174e3 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -61,13 +61,17 @@ export_loop \ XDG_CONFIG_HOME '$HOME/.config' \ GIT 'https://surdeus.su' \ PERSONAL_SHELL 'sh' \ - MYVIMRC '$HOME/.vimrc'\ + VIMRC '$HOME/.vimrc'\ XKB_DEFAULT_OPTIONS 'caps:escape' \ \ XCOMPOSER 'river' \ XTERMINAL 'wayst' \ XRUNNER 'fuzzel' \ XBAR 'waybar' \ + XBLUETOOTH_MANAGER 'blueman-manager' \ + XOUTPUT_DAEMON 'kanshi' \ + XSOUND_CONTROL 'pavucontrol' \ + XFILE_MANAGER 'thunar' \ test -r $SETENV && . "$SETENV" && setenv profile diff --git a/river/init b/river/init index d615c69..82ec4fb 100755 --- a/river/init +++ b/river/init @@ -179,6 +179,7 @@ riverctl focus-follows-cursor normal # Only first time, no reloading. if test -z "$RIVER_RELOAD" ; then rivertile -view-padding 0 -outer-padding 0 & + eval $XOUTPUT_DAEMON & eval $XBAR & diff --git a/waybar/config.jsonc b/waybar/config.jsonc index f04faee..2b93a1c 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -2,57 +2,82 @@ "layer": "top", "position": "top", + "sway/language" : { + }, + "river/window" : { - "max-length": 80, - "min-length": 80 + "max-length": 30, + "on-scroll-up" : "riverctl focus-view next", + "on-scroll-down" : "riverctl focus-view previous", + "on-click-right" : "riverctl close" }, "river/mode" : { - "format": "Mode: {}" + "format": "{}" + }, + "privacy": { + "icon-spacing": 4, + "icon-size": 18, + "transition-duration": 250, + "modules": [ + { + "type": "screenshare", + "tooltip": true, + "tooltip-icon-size": 24 + }, + { + "type": "audio-out", + "tooltip": true, + "tooltip-icon-size": 24 + }, + { + "type": "audio-in", + "tooltip": true, + "tooltip-icon-size": 24 + } + ] }, "modules-left": [ "river/tags", "river/window", + "custom/left-arrow-dark", "river/mode", ], + + "custom/bar" : { + "format": "|" + }, + "modules-center": [ + "network", ], + "modules-right": [ - "clock#1", - "pulseaudio", - "gamemode", - "mpd", + "backlight", + "clock", "disk", + "cpu", + "memory", + "temperature", "battery", + "pulseaudio", + "bluetooth", "tray" ], - "custom/left-arrow-dark": { - "format": "", - "tooltip": false - }, - "custom/left-arrow-light": { - "format": "", - "tooltip": false - }, - "custom/right-arrow-dark": { - "format": "", - "tooltip": false - }, - "custom/right-arrow-light": { - "format": "", - "tooltip": false + "backlight" : { + "format" : "💡{}%", + "scroll-step": 5 }, - "sway/workspaces": { - "disable-scroll": true, - "format": "{name}" + "clock" : { + "format" : "{:%EY-%m-%d %H:%M:%S}", + "interval" : 1 }, - "clock#1": { - "format": "{:%a %d-%m-%y %H:%M}", - "tooltip": false + "bluetooth" : { + "on-click" : "$XBLUETOOTH_MANAGER" }, "pulseaudio": { @@ -96,8 +121,15 @@ "disk": { "interval": 5, "format": "Disk {percentage_used:2}%", - "path": "/" + "path": "/", + "on-click" : "$XFILE_MANAGER" }, + + "network" : { + "format" : "{ifname}/{ipaddr} U:{bandwidthUpBytes} D:{bandwidthDownBytes}", + "interval": 1 + }, + "tray": { "icon-size": 20 } diff --git a/waybar/style.css b/waybar/style.css index 788b9d1..98c429d 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -8,17 +8,30 @@ window#waybar { color: white; } +.modules-left > *, +.modules-right > * { + padding : 0 2rem ; +} + #custom-right-arrow-dark, #custom-left-arrow-dark { color: black; - background : white ; + background : gray ; } #custom-right-arrow-light, #custom-left-arrow-light { - color: white; + color: gray; background: black; } +#network { + color : red ; +} + +#clock { + color : magenta ; +} + #workspaces, #clock.1, #clock.2,