lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

update colorscheme, bar, some other wip stuff

Browse source
This commit is contained in:
Daniel Flanagan 2016-07-15 12:17:12 -05:00
parent d669712e19
commit f31c6ba404
13 changed files with 136 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
colors/gen/gen.bash
View file

@ -1,5 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCHEME="donokai"
if [[ -n $1 ]]; then
SCHEME=$1
fi
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
source "$DIR/variables.bash" source "$DIR/variables.bash"
@ -16,17 +21,21 @@ else
git clone https://github.com/lytedev/base16-builder.git "$DOTFILES_PATH/colors/gen/vendor/base16-builder" git clone https://github.com/lytedev/base16-builder.git "$DOTFILES_PATH/colors/gen/vendor/base16-builder"
fi fi
"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t vim -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml" "$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t vim -s "$DOTFILES_PATH/colors/gen/schemes/$SCHEME.yml"
"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t xresources -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml" "$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t xresources -s "$DOTFILES_PATH/colors/gen/schemes/$SCHEME.yml"
"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t shell -s "$DOTFILES_PATH/colors/gen/schemes/donokai.yml" "$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t shell -s "$DOTFILES_PATH/colors/gen/schemes/$SCHEME.yml"
COLORS_PATH=$DOTFILES_PATH/colors/gen/vendor/base16-builder/output COLORS_PATH=$DOTFILES_PATH/colors/gen/vendor/base16-builder/output
rm -f "$DOTFILES_PATH/colors/xresources" rm -f "$DOTFILES_PATH/colors/xresources"
rm -f "$DOTFILES_PATH/colors/vim" rm -f "$DOTFILES_PATH/colors/vim"
rm -f "$DOTFILES_PATH/colors/shell" rm -f "$DOTFILES_PATH/colors/shell"
cp "$COLORS_PATH/xresources/base16-donokai.dark.xresources" "$DOTFILES_PATH/colors/xresources" cp "$COLORS_PATH/xresources/base16-$SCHEME.dark.xresources" "$DOTFILES_PATH/colors/xresources"
cp "$COLORS_PATH/vim/base16-donokai.vim" "$DOTFILES_PATH/colors/vim" cp "$COLORS_PATH/vim/base16-$SCHEME.vim" "$DOTFILES_PATH/colors/vim"
cp "$COLORS_PATH/shell/base16-donokai.dark.sh" "$DOTFILES_PATH/colors/shell" cp "$COLORS_PATH/shell/base16-$SCHEME.dark.sh" "$DOTFILES_PATH/colors/shell"
chmod +x "$DOTFILES_PATH/colors/shell" chmod +x "$DOTFILES_PATH/colors/shell"
xrdb -merge "$DOTFILES_PATH/colors/xresources"
source "$DOTFILES_PATH/scripts/reload_xresources.sh"
source "$DOTFILES_PATH/wm/bspwm_config" > /dev/null
kill -SIGUSR1 $(cat "$BAR_PID_FILE")

18
colors/gen/schemes/bright.yml Normal file
View file

@ -0,0 +1,18 @@
scheme: "Bright"
author: "Chris Kempson (http://chriskempson.com)"
base00: "111111"
base01: "303030"
base02: "505050"
base03: "b0b0b0"
base04: "d0d0d0"
base05: "e0e0e0"
base06: "f5f5f5"
base07: "ffffff"
base08: "fb0120"
base09: "fc6d24"
base0A: "fda331"
base0B: "a1c659"
base0C: "76c7b7"
base0D: "6fb3d2"
base0E: "d381c3"
base0F: "be643c"

19
colors/gen/schemes/exp-donokai.yml
View file

@ -1,19 +0,0 @@
scheme: "Donokai"
author: "Wimer Hazenberg (http://www.monokai.nl)"
base00: "111111"
base01: "383830"
base02: "49483e"
base03: "75715e"
base04: "a59f85"
base05: "f8f8f2"
base06: "f5f4f1"
base07: "f9f8f5"
base08: "00aaff"
base09: "00aaff"
base0A: "00aaff"
base0B: "00aaff"
base0C: "00aaff"
base0D: "00aaff"
base0E: "00aaff"
base0F: "00aaff"

48
colors/shell
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Base16 Donokai - Shell color setup script # Base16 Bright - Shell color setup script
# Wimer Hazenberg (http://www.monokai.nl) # Chris Kempson (http://chriskempson.com)
if [ "${TERM%%-*}" = 'linux' ]; then if [ "${TERM%%-*}" = 'linux' ]; then
# This script doesn't support linux console (use 'vconsole' template instead) # This script doesn't support linux console (use 'vconsole' template instead)
@ -8,30 +8,30 @@ if [ "${TERM%%-*}" = 'linux' ]; then
fi fi
color00="11/11/11" # Base 00 - Black color00="11/11/11" # Base 00 - Black
color01="f9/26/72" # Base 08 - Red color01="fb/01/20" # Base 08 - Red
color02="a6/e2/2e" # Base 0B - Green color02="a1/c6/59" # Base 0B - Green
color03="f4/bf/75" # Base 0A - Yellow color03="fd/a3/31" # Base 0A - Yellow
color04="66/d9/ef" # Base 0D - Blue color04="6f/b3/d2" # Base 0D - Blue
color05="ae/81/ff" # Base 0E - Magenta color05="d3/81/c3" # Base 0E - Magenta
color06="a1/ef/e4" # Base 0C - Cyan color06="76/c7/b7" # Base 0C - Cyan
color07="f8/f8/f2" # Base 05 - White color07="e0/e0/e0" # Base 05 - White
color08="75/71/5e" # Base 03 - Bright Black color08="b0/b0/b0" # Base 03 - Bright Black
color09=$color01 # Base 08 - Bright Red color09=$color01 # Base 08 - Bright Red
color10=$color02 # Base 0B - Bright Green color10=$color02 # Base 0B - Bright Green
color11=$color03 # Base 0A - Bright Yellow color11=$color03 # Base 0A - Bright Yellow
color12=$color04 # Base 0D - Bright Blue color12=$color04 # Base 0D - Bright Blue
color13=$color05 # Base 0E - Bright Magenta color13=$color05 # Base 0E - Bright Magenta
color14=$color06 # Base 0C - Bright Cyan color14=$color06 # Base 0C - Bright Cyan
color15="f9/f8/f5" # Base 07 - Bright White color15="ff/ff/ff" # Base 07 - Bright White
color16="fd/97/1f" # Base 09 color16="fc/6d/24" # Base 09
color17="cc/66/33" # Base 0F color17="be/64/3c" # Base 0F
color18="38/38/30" # Base 01 color18="30/30/30" # Base 01
color19="49/48/3e" # Base 02 color19="50/50/50" # Base 02
color20="a5/9f/85" # Base 04 color20="d0/d0/d0" # Base 04
color21="f5/f4/f1" # Base 06 color21="f5/f5/f5" # Base 06
color_foreground="f8/f8/f2" # Base 05 color_foreground="e0/e0/e0" # Base 05
color_background="11/11/11" # Base 00 color_background="11/11/11" # Base 00
color_cursor="f8/f8/f2" # Base 05 color_cursor="e0/e0/e0" # Base 05
if [ -n "$TMUX" ]; then if [ -n "$TMUX" ]; then
# tell tmux to pass the escape sequences through # tell tmux to pass the escape sequences through
@ -82,12 +82,12 @@ printf $printf_template 21 $color21
# foreground / background / cursor color # foreground / background / cursor color
if [ -n "$ITERM_SESSION_ID" ]; then if [ -n "$ITERM_SESSION_ID" ]; then
# iTerm2 proprietary escape codes # iTerm2 proprietary escape codes
printf $printf_template_custom Pg f8f8f2 # forground printf $printf_template_custom Pg e0e0e0 # forground
printf $printf_template_custom Ph 111111 # background printf $printf_template_custom Ph 111111 # background
printf $printf_template_custom Pi f8f8f2 # bold color printf $printf_template_custom Pi e0e0e0 # bold color
printf $printf_template_custom Pj 49483e # selection color printf $printf_template_custom Pj 505050 # selection color
printf $printf_template_custom Pk f8f8f2 # selected text color printf $printf_template_custom Pk e0e0e0 # selected text color
printf $printf_template_custom Pl f8f8f2 # cursor printf $printf_template_custom Pl e0e0e0 # cursor
printf $printf_template_custom Pm 111111 # cursor text printf $printf_template_custom Pm 111111 # cursor text
else else
printf $printf_template_var 10 $color_foreground printf $printf_template_var 10 $color_foreground

38
colors/vim
View file

@ -1,5 +1,5 @@
" Base16 Donokai (https://github.com/chriskempson/base16) " Base16 Bright (https://github.com/chriskempson/base16)
" Scheme: Wimer Hazenberg (http://www.monokai.nl) " Scheme: Chris Kempson (http://chriskempson.com)
" This enables the coresponding base16-shell script to run so that " This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts " :colorscheme works in terminals supported by base16-shell scripts
@ -7,27 +7,27 @@
" let g:base16_shell_path=base16-builder/output/shell/ " let g:base16_shell_path=base16-builder/output/shell/
if !has('gui_running') if !has('gui_running')
if exists("g:base16_shell_path") if exists("g:base16_shell_path")
execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.".&background.".sh"
endif endif
endif endif
" GUI color definitions " GUI color definitions
let s:gui00 = "111111" let s:gui00 = "111111"
let s:gui01 = "383830" let s:gui01 = "303030"
let s:gui02 = "49483e" let s:gui02 = "505050"
let s:gui03 = "75715e" let s:gui03 = "b0b0b0"
let s:gui04 = "a59f85" let s:gui04 = "d0d0d0"
let s:gui05 = "f8f8f2" let s:gui05 = "e0e0e0"
let s:gui06 = "f5f4f1" let s:gui06 = "f5f5f5"
let s:gui07 = "f9f8f5" let s:gui07 = "ffffff"
let s:gui08 = "f92672" let s:gui08 = "fb0120"
let s:gui09 = "fd971f" let s:gui09 = "fc6d24"
let s:gui0A = "f4bf75" let s:gui0A = "fda331"
let s:gui0B = "a6e22e" let s:gui0B = "a1c659"
let s:gui0C = "a1efe4" let s:gui0C = "76c7b7"
let s:gui0D = "66d9ef" let s:gui0D = "6fb3d2"
let s:gui0E = "ae81ff" let s:gui0E = "d381c3"
let s:gui0F = "cc6633" let s:gui0F = "be643c"
" Terminal color definitions " Terminal color definitions
let s:cterm00 = "00" let s:cterm00 = "00"
@ -59,7 +59,7 @@ endif
" Theme setup " Theme setup
hi clear hi clear
syntax reset syntax reset
let g:colors_name = "base16-donokai" let g:colors_name = "base16-bright"
" Highlighting function " Highlighting function
fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)

34
colors/xresources
View file

@ -1,22 +1,22 @@
! Base16 Donokai ! Base16 Bright
! Scheme: Wimer Hazenberg (http://www.monokai.nl) ! Scheme: Chris Kempson (http://chriskempson.com)
#define base00 #111111 #define base00 #111111
#define base01 #383830 #define base01 #303030
#define base02 #49483e #define base02 #505050
#define base03 #75715e #define base03 #b0b0b0
#define base04 #a59f85 #define base04 #d0d0d0
#define base05 #f8f8f2 #define base05 #e0e0e0
#define base06 #f5f4f1 #define base06 #f5f5f5
#define base07 #f9f8f5 #define base07 #ffffff
#define base08 #f92672 #define base08 #fb0120
#define base09 #fd971f #define base09 #fc6d24
#define base0A #f4bf75 #define base0A #fda331
#define base0B #a6e22e #define base0B #a1c659
#define base0C #a1efe4 #define base0C #76c7b7
#define base0D #66d9ef #define base0D #6fb3d2
#define base0E #ae81ff #define base0E #d381c3
#define base0F #cc6633 #define base0F #be643c
*foreground: base05 *foreground: base05
*background: base00 *background: base00

12
sh/bashrc
View file

@ -4,6 +4,8 @@ BASE16_SHELL="$DOTFILES_PATH/colors/shell"
[[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL" [[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"
if [ -t 0 ]; then if [ -t 0 ]; then
source "$DOTFILES_PATH/variables.bash"
# disable ctrl-s terminal freeze # disable ctrl-s terminal freeze
[[ $- == *i* ]] && stty -ixon [[ $- == *i* ]] && stty -ixon
@ -53,6 +55,16 @@ if [ -t 0 ]; then
# wm aliases # wm aliases
alias startbar="source $DOTFILES_PATH/wm/extras/bar/start.bash" alias startbar="source $DOTFILES_PATH/wm/extras/bar/start.bash"
stopbar() {
if [[ -f "$BAR_PID_FILE" ]]; then
kill -SIGINT $(cat "$BAR_PID_FILE")
rm -f "$BAR_PID_FILE"
killall lemonbar
else
echo "Bar is not running."
fi
}
export -f stopbar
# misc aliases # misc aliases
alias keyrepeat="xset r rate 250 80" alias keyrepeat="xset r rate 250 80"

1
variables.bash
View file

@ -7,6 +7,7 @@ export DOTFILES_PATH="$HOME/.dotfiles"
export REPOSITORY_PATH="$HOME/Documents/open-source" export REPOSITORY_PATH="$HOME/Documents/open-source"
export WINDOW_GAP=5 export WINDOW_GAP=5
export BORDER_WIDTH=1 export BORDER_WIDTH=1
export BAR_PID_FILE="$DOTFILES_PATH/wm_bar.pid"
source "$DOTFILES_PATH/scripts/get_x_fonts.sh" source "$DOTFILES_PATH/scripts/get_x_fonts.sh"
source "$DOTFILES_PATH/scripts/get_color.sh" source "$DOTFILES_PATH/scripts/get_color.sh"

2
wm/extras/bar/colors.bash
View file

@ -1,5 +1,5 @@
export COLOR_FOREGROUND="#ff$(get_color 05)" export COLOR_FOREGROUND="#ff$(get_color 05)"
export COLOR_DARK="#ff$(get_color 03)" export COLOR_DARK="#ff$(get_color 02)"
export COLOR_BACKGROUND="#ff$(get_color 00)" export COLOR_BACKGROUND="#ff$(get_color 00)"
export COLOR_HIGHLIGHT="#ff$(get_color 0D)" export COLOR_HIGHLIGHT="#ff$(get_color 0D)"
export COLOR_URGENT="#ff$(get_color 08)" export COLOR_URGENT="#ff$(get_color 08)"

6
wm/extras/bar/formatter.bash
View file

@ -6,6 +6,12 @@ source "$DOTFILES_PATH/wm/extras/bar/colors.bash"
# export BAR_LOG="$PWD/bar.log" # export BAR_LOG="$PWD/bar.log"
# echo -e "BEGIN BAR LOG\n" > "$BAR_LOG" # echo -e "BEGIN BAR LOG\n" > "$BAR_LOG"
reload_colors() {
source "$DOTFILES_PATH/wm/extras/bar/colors.bash"
}
# trap reload_colors SIGUSR1
export MODULE_MATCH=() export MODULE_MATCH=()
export MODULE_CALLBACK=() export MODULE_CALLBACK=()
export MODULE_DATA=() export MODULE_DATA=()

2
wm/extras/bar/modules/bspwm-bm.bash
View file

@ -2,9 +2,11 @@
source "$DOTFILES_PATH/variables.bash" source "$DOTFILES_PATH/variables.bash"
source "$DOTFILES_PATH/wm/extras/bar/colors.bash" source "$DOTFILES_PATH/wm/extras/bar/colors.bash"
source "$DOTFILES_PATH/wm/extras/bar/modules/module.bash"
PRIORITY=25000 PRIORITY=25000
PID_PREFIX="bspwm"
MATCH_PREFIX="W" MATCH_PREFIX="W"
MATCH="$MATCH_PREFIX*" MATCH="$MATCH_PREFIX*"

17
wm/extras/bar/modules/module.bash Normal file
View file

@ -0,0 +1,17 @@
#!/usr/bin/env bash
source "$DOTFILES_PATH/variables.bash"
source "$DOTFILES_PATH/wm/extras/bar/colors.bash"
reserve_bar_module_pid() {
FILE="$DOTFILES_PATH/wm/extras/bar/modules/$1.bm.pid"
if [[ -f "$FILE" ]]; then
return 1
else
echo "Starting bar module $1 witrh PID $!"
$2 &
return 0
fi
}

15
wm/extras/bar/start.bash
View file

@ -1,19 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export BAR_PID_FILE="$DOTFILES_PATH/wm_bar.pid" source "$DOTFILES_PATH/variables.bash"
"$DOTFILES_PATH/wm/extras/bar/run_bar.bash" & "$DOTFILES_PATH/wm/extras/bar/run_bar.bash" &
export BAR_PID=$!
echo "$!" > "$BAR_PID_FILE" echo "$BAR_PID" > "$BAR_PID_FILE"
echo "Starting bar with PID $!" echo "Starting bar with PID $BAR_PID"
export BAR_PID="$!"
stopbar() {
kill -SIGINT $(cat "$BAR_PID_FILE")
rm -f "$BAR_PID_FILE"
}
export -f stopbar
xdo lower -a wmpanel xdo lower -a wmpanel