Fix bashrc not loading NICE_HOME properly

This commit is contained in:
Daniel Flanagan 2018-03-18 12:51:03 -05:00
parent a7a4a32381
commit 1043ee6042
4 changed files with 7 additions and 2 deletions

View file

@ -172,6 +172,7 @@ Plug 'hail2u/vim-css3-syntax', {'for': ['styl', 'stylus', 'css', 'vue']}
Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'coffeescript', 'vue']} Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'coffeescript', 'vue']}
Plug 'posva/vim-vue', {'for': ['vue']} Plug 'posva/vim-vue', {'for': ['vue']}
Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'eelixir']} Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'eelixir']}
Plug 'elixir-lang/', {'for': ['elixir', 'eelixir']}
Plug 'mattn/emmet-vim', {'for': ['html']} Plug 'mattn/emmet-vim', {'for': ['html']}
Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']} Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']}
Plug 'quabug/vim-gdscript', {'for': ['gd', 'gdscript']} Plug 'quabug/vim-gdscript', {'for': ['gd', 'gdscript']}
@ -179,6 +180,7 @@ Plug 'rust-lang/rust.vim', {'for': ['rs', 'rust']}
Plug 'mustache/vim-mustache-handlebars', {'for': ['html.handlebars', 'handlebars', 'hbs']} Plug 'mustache/vim-mustache-handlebars', {'for': ['html.handlebars', 'handlebars', 'hbs']}
Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown', 'vimwiki']} Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown', 'vimwiki']}
Plug 'lifepillar/pgsql.vim', {'for': ['psql', 'sql']} Plug 'lifepillar/pgsql.vim', {'for': ['psql', 'sql']}
Plug 'cespare/vim-toml', {'for': ['toml']}
Plug 'vim-scripts/utl.vim' Plug 'vim-scripts/utl.vim'
let g:utl_cfg_hdl_scm_http_system = "silent !$BROWSER '%u#%f' &" let g:utl_cfg_hdl_scm_http_system = "silent !$BROWSER '%u#%f' &"

View file

@ -8,6 +8,7 @@ export BAR_SIDE_MARGIN=200
MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1) MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1)
export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1) export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)
export BAR_ICON_FONT="Font Awesome 5 Free" export BAR_ICON_FONT="Font Awesome 5 Free"
export BAR_ICON_FONT_2="Font Awesome 5 Brands"
export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1) export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)
export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE)) export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE))
@ -28,6 +29,7 @@ fi
export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1" export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1"
export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:pixelsize=${BAR_ICON_FONT_SIZE};1" export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:pixelsize=${BAR_ICON_FONT_SIZE};1"
export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:pixelsize=${BAR_ICON_FONT_SIZE};1"
export BAR_WIDTH=$((MONITOR_WIDTH - GAP - GAP - BAR_SIDE_MARGIN - BAR_SIDE_MARGIN)) export BAR_WIDTH=$((MONITOR_WIDTH - GAP - GAP - BAR_SIDE_MARGIN - BAR_SIDE_MARGIN))
export POS_X=$((GAP + BAR_SIDE_MARGIN)) export POS_X=$((GAP + BAR_SIDE_MARGIN))

View file

@ -44,6 +44,7 @@ module-margin-right = 2
font-0 = ${env:BAR_FONT_DECLARATION} font-0 = ${env:BAR_FONT_DECLARATION}
font-1 = ${env:BAR_ICON_FONT_DECLARATION} font-1 = ${env:BAR_ICON_FONT_DECLARATION}
font-2 = ${env:BAR_ICON_FONT_2_DECLARATION}
modules-left = bspwm modules-left = bspwm
modules-center = modules-center =
@ -178,7 +179,7 @@ card = intel_backlight
[module/cpu] [module/cpu]
type = internal/cpu type = internal/cpu
interval = 2 interval = 2
format-prefix = "- " format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
; format-underline = #f90000 ; format-underline = #f90000
label = %percentage%% label = %percentage%%

View file

@ -9,7 +9,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles" export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
export NICE_HOME="$HOME" export NICE_HOME="$HOME"
[[ $(basename "${HOME}") -eq "usr" ]] && export NICE_HOME="$HOME/.." [[ $(basename "${HOME}") = "usr" ]] && export NICE_HOME="$HOME/.."
# TODO: nice home on a per-device basis # TODO: nice home on a per-device basis