getting ready for the merge - I'm sure this will end badly
This commit is contained in:
parent
55aa97f0e0
commit
4b0951b7ab
6 changed files with 25 additions and 10 deletions
|
@ -8,8 +8,8 @@ export BAR_SIDE_MARGIN=200
|
|||
export GAP=$(bspc wm -d | grep -Po '(windowGap.*?,)' | grep -Po '\d*' | head -n 1)
|
||||
MONITOR_WIDTH=$(xrandr | grep DVI-I-2 | grep -Po ' \d+' | head -n 1)
|
||||
export BAR_WIDTH=$((MONITOR_WIDTH - GAP - GAP - BAR_SIDE_MARGIN - BAR_SIDE_MARGIN))
|
||||
export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\(.*\)\-.*$/\1/p')
|
||||
export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p')
|
||||
export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\(.*\)\-.*$/\1/p' | head -n 1)
|
||||
export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1)
|
||||
export POS_X=$((GAP + BAR_SIDE_MARGIN))
|
||||
|
||||
export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
BORDER_WIDTH=0
|
||||
BORDER_WIDTH=0 # change in bspwmrc
|
||||
WINDOW_GAP=25
|
||||
DESKTOPS=(dev web misc env play out main srv daem util)
|
||||
|
||||
|
|
22
de/bspwmrc
22
de/bspwmrc
|
@ -1,10 +1,14 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
BORDER_WIDTH=0 # change in bspwm_config, here for launcher
|
||||
START_BAR=1
|
||||
BAR_COMMAND="$DOTFILES_PATH/de/bar/bar.bash"
|
||||
|
||||
if [[ -z "$XDG_CONFIG_HOME" ]]; then
|
||||
export XDG_CONFIG_HOME="$HOME/.config"
|
||||
export XDG_CONFIG_HOME="$HOME/.config"
|
||||
fi
|
||||
if [[ -z "$DOTFILES_PATH" ]]; then
|
||||
export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
|
||||
export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
|
||||
fi
|
||||
|
||||
BSPWM_STATE_FILE="$HOME/.bspwm_state"
|
||||
|
@ -17,11 +21,21 @@ fi
|
|||
source "$DOTFILES_PATH/de/bspwm_config"
|
||||
|
||||
if command -v urxvtd >/dev/null 2>&1; then
|
||||
urxvtd &
|
||||
urxvtd &
|
||||
fi
|
||||
|
||||
if command -v sxhkd >/dev/null 2>&1; then
|
||||
sxhkd &
|
||||
export LAUNCHER_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\(.*\)\-.*$/\1/p' | head -n 1)
|
||||
export LAUNCHER_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1)
|
||||
export HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*color1*:\s*\(.*\)$/\1/p' | head -n 1)
|
||||
export BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1/p' | head -n 1)
|
||||
export FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1)
|
||||
# export HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1)
|
||||
sxhkd &
|
||||
fi
|
||||
|
||||
if [[ $START_BAR -eq 1 ]]; then
|
||||
${BAR_COMMAND} &
|
||||
fi
|
||||
|
||||
bspc wm -o
|
||||
|
|
|
@ -166,7 +166,7 @@ super + shift + Return
|
|||
|
||||
# spawn the app launcher
|
||||
super + space
|
||||
rofi -show run -font "$PRIMARY_FONT_FAMILY $PRIMARY_FONT_SIZE" -lines 16 -width 10 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "#$(get_color 00)","#$(get_color 0D)","#$(get_color 0D)","#$(get_color 00)" -color-normal "#$(get_color 00)","#$(get_color 06)","#$(get_color 00)","#$(get_color 0D)","#$(get_color 00)" -separator-style none -hide-scrollbar
|
||||
rofi -show run -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -lines 16 -width 10 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR" -separator-style none -hide-scrollbar
|
||||
|
||||
# lock the desktop
|
||||
super + ctrl + shift + l
|
||||
|
|
|
@ -69,5 +69,5 @@ Here are some bullet points on my workflow as a Web Developer:
|
|||
|
||||
## To Do and Improvements
|
||||
|
||||
* Add a file containing common variables in `common/`.
|
||||
* Add more content to the other sections?
|
||||
* Start refactoring old dotfiles and scripts.
|
||||
|
|
|
@ -147,7 +147,8 @@ set noexpandtab
|
|||
set autoindent smartindent
|
||||
set list
|
||||
set nostartofline
|
||||
set listchars=trail:·,tab:\__
|
||||
set listchars=trail:·,tab:\ \ ,trail:~
|
||||
" set listchars=eol:\ ,tab:>-,trail:~,extends:>,precedes:<,space:·
|
||||
|
||||
" look and feel
|
||||
|
||||
|
|
Reference in a new issue