This commit is contained in:
Daniel Flanagan 2020-01-24 15:55:53 -06:00
parent ba6a2135d0
commit 037e8560f4
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
4 changed files with 17 additions and 14 deletions

View file

@ -1,9 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
NO_COMPTON=1
START_BAR=1
BAR_COMMAND="startbar" BAR_COMMAND="startbar"
BSPWM_STATE_FILE="$HOME/.bspwm_state" BSPWM_STATE_FILE="$HOME/.bspwm_state"
if [ -e "$BSPWM_STATE" ] ; then if [ -e "$BSPWM_STATE" ] ; then
@ -11,13 +8,12 @@ if [ -e "$BSPWM_STATE" ] ; then
rm "$BSPWM_STATE" rm "$BSPWM_STATE"
fi fi
export BORDER_WIDTH=5
. "$DOTFILES_PATH/apps/de/bspwm/config" . "$DOTFILES_PATH/apps/de/bspwm/config"
[ -f "$DOTFILES_PATH/apps/de/x/loadresources" ] && "$DOTFILES_PATH/apps/de/x/loadresources" [ -f "$DOTFILES_PATH/apps/de/x/loadresources" ] && "$DOTFILES_PATH/apps/de/x/loadresources"
[ -f "$HOME/.fehbg" ] && "$HOME/.fehbg" & [ -f "$HOME/.fehbg" ] && "$HOME/.fehbg" &
[ "$NO_COMPTON" -ne 1 ] && has_command compton && compton & [ "$(xrq bspwm.start_compton)" = "true" ] && has_command compton && compton &
[ "$START_BAR" -eq 1 ] && has_command "${BAR_COMMAND}" && "${BAR_COMMAND}" & [ "$(xrq bspwm.start_bar)" = "true" ] && has_command "${BAR_COMMAND}" && "${BAR_COMMAND}" &
has_command urxvtd && urxvtd & has_command urxvtd && urxvtd &
has_command dunst && dunst & has_command dunst && dunst &
has_command sxhkd && sxhkd -m -1 & has_command sxhkd && sxhkd -m -1 &

View file

@ -41,8 +41,8 @@ time = ${colors.foreground}
monitor = ${xrdb:polybar.display_monitor:HDMI-1} monitor = ${xrdb:polybar.display_monitor:HDMI-1}
width = ${xrdb:polybar.width:100%-200} width = ${xrdb:polybar.width:100%-200}
height = ${xrdb:polybar.height:40} height = ${xrdb:polybar.height:40}
offset-x = ${xrdb:polybar.offset_x:30} offset-x = ${xrdb:polybar.offset_x:100}
offset-y = ${xrdb:polybar.offset_y:30} offset-y = ${xrdb:polybar.offset_y:100}
radius = 0.0 radius = 0.0
fixed-center = true fixed-center = true
bottom = ${xrdb:polybar.bottom_of_display:true} bottom = ${xrdb:polybar.bottom_of_display:true}
@ -63,7 +63,7 @@ padding-right = 2
module-margin-left = 1 module-margin-left = 1
module-margin-right = 1 module-margin-right = 1
font-0 = ${xrdb:polybar.primary_font} font-0 = iosevka\-lyte:pixelsize=14;1
font-1 = ${xrdb:polybar.secondary_font} font-1 = ${xrdb:polybar.secondary_font}
modules-left = bspwm modules-left = bspwm

View file

@ -6,6 +6,10 @@ yoffset="$(xrq polybar.offset_y)"
eheight="$((height + margin + yoffset))" eheight="$((height + margin + yoffset))"
bar_monitor="$(xrq polybar.display_monitor)" bar_monitor="$(xrq polybar.display_monitor)"
# export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1"
# export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:style=Solid:pixelsize=${BAR_ICON_FONT_SIZE};1"
# export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:style=Regular:pixelsize=${BAR_ICON_FONT_SIZE};1"
# TODO: if bspwm is the active window manager # TODO: if bspwm is the active window manager
if has_command bspc; then if has_command bspc; then
if [ ! "$(xrq polybar.bottom_of_display)" = "true" ]; then if [ ! "$(xrq polybar.bottom_of_display)" = "true" ]; then

View file

@ -2,8 +2,9 @@
#define mono_font iosevka-lyte #define mono_font iosevka-lyte
#define mono_font_size 14 #define mono_font_size 14
#define mono_font_letterspace 0 #define mono_font_letterspace 0
#define icon_font Font Awesome 5 Free Solid
#define icon_font_size 12
#define bold_mono_font iosevka-lyte Semibold #define bold_mono_font iosevka-lyte Semibold
#define icon_font Font Awesome 5 Free
#define emoji_font Noto Emoji #define emoji_font Noto Emoji
#define font_fallback_stack xft:icon_font,xft:FreeSans #define font_fallback_stack xft:icon_font,xft:FreeSans
@ -68,20 +69,22 @@ bspwm.border_width: window_border
bspwm.num_desktops: 10 bspwm.num_desktops: 10
bspwm.reverse_desktop_ordering: 0 bspwm.reverse_desktop_ordering: 0
bspwm.split_ratio: 0.5 bspwm.split_ratio: 0.5
bspwm.start_compton: false
bspwm.start_bar: true
! polybar ! polybar
polybar.primary_font: xft:mono_font:pixelsize=mono_font_size polybar.primary_font: mono_font:pixelsize=mono_font_size;1
polybar.secondary_font: xft:icon_font:pixelsize=mono_font_size polybar.secondary_font: icon_font:style=Regular:pixelsize=icon_font_size;1
polybar.display_monitor: HDMI-1 polybar.display_monitor: HDMI-1
polybar.bottom_of_display: true polybar.bottom_of_display: true
polybar.margin: window_margin polybar.margin: window_margin
polybar.storage_volume: / polybar.storage_volume: /
polybar.ethernet_interface: eth0 polybar.ethernet_interface: eth0
polybar.wireless_interface: wan0 polybar.wireless_interface: wan0
polybar.width: 100%:-100 polybar.width: 100%
polybar.height: 40 polybar.height: 40
! if you have a margin value, be sure to include that in your offsets ! if you have a margin value, be sure to include that in your offsets
polybar.offset_x: 50 polybar.offset_x: 0
polybar.offset_y: 0 polybar.offset_y: 0
! rofi ! rofi