From 1ce4bbf0758c8063b234e442f2d321b2eb6be280 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 30 Aug 2016 17:14:27 -0500 Subject: [PATCH] stuff --- env/sh/bashrc | 4 ++++ env/wm/bspwm_config | 3 +++ env/wm/extras/bar/start.bash | 3 ++- env/x/xinitrc | 2 +- variables.bash | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/env/sh/bashrc b/env/sh/bashrc index ffcfa25..2e6d7d3 100644 --- a/env/sh/bashrc +++ b/env/sh/bashrc @@ -25,6 +25,7 @@ if [ -t 0 ]; then # navigation aliases alias cd..="cd .." + alias cdd="cd \"$DOTFILES_PATH\"" alias ..="cd .." alias ...="cd ../.." alias ....="cd ../../.." @@ -49,6 +50,7 @@ if [ -t 0 ]; then # networking aliases alias p="ping 8.8.8.8" + alias wifi-menu="sudo wifi-menu" alias wifi="sudo systemctl start netctl-auto@$(for wli in /sys/class/net/wl*; do echo $(basename $wli); break; done)" # emacs aliases @@ -166,4 +168,6 @@ if [ -t 0 ]; then if [ -a "$HOME/.bashrc_env" ]; then . "$HOME/.bashrc_env" fi + + cd "$HOME/.." fi diff --git a/env/wm/bspwm_config b/env/wm/bspwm_config index 8c4702d..eb4c445 100755 --- a/env/wm/bspwm_config +++ b/env/wm/bspwm_config @@ -32,3 +32,6 @@ for mon in $(bspc query -M); do i=$((max + 1)) done +if [[ -f "$HOME/.bspwm_env" ]]; then + source "$HOME/.bspwm_env" +fi diff --git a/env/wm/extras/bar/start.bash b/env/wm/extras/bar/start.bash index 5a999a8..8932617 100755 --- a/env/wm/extras/bar/start.bash +++ b/env/wm/extras/bar/start.bash @@ -38,6 +38,7 @@ fi # get width of our main monitor WIDTH=`xrandr -q | egrep '(^| )connected( |$)' | tr 'x' '\n' | head -n 1 | awk '{print $NF}'` WIDTH=$((WIDTH-BAR_MARGIN-BAR_MARGIN)) +OFFSET=$((BAR_MARGIN+BAR_OFFSET)) BAR_B="" if [ $BAR_TOP -eq 1 ]; then @@ -49,4 +50,4 @@ fi source "$BAR_PATH/colors.bash" cat "$BAR_FIFO" | "$BAR_PATH/formatter.bash" | \ - lemonbar $BAR_B -g "$WIDTH"x"$BAR_HEIGHT"+"$BAR_MARGIN"+"$POS_Y" -u "$BAR_BORDER_WIDTH" -f "$BAR_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B"$COLOR_BACKGROUND" -n "$BAR_WID" + lemonbar $BAR_B -g "$WIDTH"x"$BAR_HEIGHT"+"$OFFSET"+"$POS_Y" -u "$BAR_BORDER_WIDTH" -f "$BAR_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B"$COLOR_BACKGROUND" -n "$BAR_WID" diff --git a/env/x/xinitrc b/env/x/xinitrc index 28424fd..3daa482 100644 --- a/env/x/xinitrc +++ b/env/x/xinitrc @@ -21,7 +21,7 @@ if [ "$BAR_ON_XINIT" -eq 1 ]; then fi # fire up wm -unclutter & +# unclutter & sxhkd & urxvtd & exec bspwm diff --git a/variables.bash b/variables.bash index e95532e..6b6eb47 100755 --- a/variables.bash +++ b/variables.bash @@ -23,6 +23,7 @@ export BAR_FONT_FAMILY="$PRIMARY_FONT_FAMILY_WITH_SIZE" export BAR_UNDERLINE=1 # export BAR_MARGIN=$WINDOW_GAP export BAR_MARGIN=700 +export BAR_OFFSET=0 export BAR_WID="wmpanel" export TOP_BAR_PADDING=0