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

remove base16 from git, ignore color gen base16 clone dir, finished color gen script, added more arch packages

This commit is contained in:
Daniel Flanagan 2017-02-08 12:32:58 -06:00
parent 575d73275c
commit 3723faea0c
5 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/colors/generator/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
vendor

40
common/colors/generator/gen.bash
View File

@ -1,19 +1,19 @@
#!/usr/bin/env bash
SCHEME="donokai"
v=$(ruby --version)
if [[ $? -eq 0 ]]; then
SCHEME="donokai"
if [[ -n $1 ]]; then
SCHEME=$1
fi
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
source "$DIR/variables.bash"
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)
mkdir -p "$DOTFILES_PATH/colors/gen/vendor"
mkdir -p "$DIR/vendor"
B16_DIR="$DOTFILES_PATH/colors/gen/vendor/base16-builder"
B16_DIR="$DIR/vendor/base16-builder"
COLORS_PATH="$B16_DIR/output"
if [ -d "$B16_DIR" ]; then
@ -21,27 +21,23 @@ if [[ $? -eq 0 ]]; then
rm -rf "$COLORS_PATH"
mkdir -p "$COLORS_PATH"
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 "$DIR/vendor/base16-builder"
fi
"$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/$SCHEME.yml"
"$DOTFILES_PATH/colors/gen/vendor/base16-builder/base16" -t shell -s "$DOTFILES_PATH/colors/gen/schemes/$SCHEME.yml"
"$DIR/vendor/base16-builder/base16" -t vim -s "$DIR/schemes/$SCHEME.yml"
"$DIR/vendor/base16-builder/base16" -t xresources -s "$DIR/schemes/$SCHEME.yml"
"$DIR/vendor/base16-builder/base16" -t shell -s "$DIR/schemes/$SCHEME.yml"
COLORS_PATH=$DOTFILES_PATH/colors/gen/vendor/base16-builder/output
# replace existing color files
rm -f "$DIR/../shell"
rm -f "$DIR/../vim"
rm -f "$DIR/../xresources"
cp "$COLORS_PATH/xresources/base16-$SCHEME.dark.xresources" "$DIR/../xresources"
cp "$COLORS_PATH/vim/base16-$SCHEME.vim" "$DIR/../vim"
cp "$COLORS_PATH/shell/base16-$SCHEME.dark.sh" "$DIR/../shell"
chmod +x "$DIR/../shell"
rm -f "$DOTFILES_PATH/colors/xresources"
rm -f "$DOTFILES_PATH/colors/vim"
rm -f "$DOTFILES_PATH/colors/shell"
cp "$COLORS_PATH/xresources/base16-$SCHEME.dark.xresources" "$DOTFILES_PATH/colors/xresources"
cp "$COLORS_PATH/vim/base16-$SCHEME.vim" "$DOTFILES_PATH/colors/vim"
cp "$COLORS_PATH/shell/base16-$SCHEME.dark.sh" "$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/env/wm/bspwm_config" > /dev/null
# kill -SIGUSR1 $(cat "$BAR_PID_FILE")
echo "Colors have been regenerated. You will need to re-link them."
else
echo "Ruby isn't installed."
fi

1
common/colors/generator/vendor/base16-builder vendored

@ -1 +0,0 @@
Subproject commit 944e88a10bc145f56ead1d6d82a06f252c92adc1

14
common/colors/link.bash
View File

@ -1,14 +0,0 @@
#!/usr/bin/env bash
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
source "$DIR/variables.bash"
mkdir -p "$DOTFILES_PATH/editor/nvim/config/colors"
rm -f ~/.Xresources.colors
rm -f "$DOTFILES_PATH/editor/nvim/config/colors/current.vim"
ln -s "$DOTFILES_PATH/colors/xresources" "$HOME/.Xresources.colors"
ln -s "$DOTFILES_PATH/colors/vim" "$DOTFILES_PATH/editor/nvim/config/colors/current.vim"
source "$DOTFILES_PATH/env/x/xloadresources"

2
os-specific/arch-linux/provisioning/3-extras.bash
View File

@ -15,4 +15,6 @@ pacaur -S \
audacity
reptyr \
cmake python2 python2-pip \
lightdm \
polybar-git \
--noconfirm --noedit