2 files changed, 24 insertions(+), 46 deletions(-)

M install.sh
M overlay/bin/configure-dpms

@@ 28,6 28,23 @@ find . -type f | while read -r target ; do
 	cp "$target" "$dest_file"
 done
 
+# setup gitconfig
+git_username="$(git config --get user.name)"
+git_email="$(git config --get user.email)"
+git_config_file="$HOME/.gitconfig"
+rm -f "$git_config_file"
+echo '[user]' >> "$git_config_file"
+echo "    name = $git_username" >> "$git_config_file"
+echo "    email = $git_email" >> "$git_config_file"
+echo "" >> "$git_config_file"
+cat "$DOTFILES_DIR/gitconfig" >> "$git_config_file"
+
+# install fastabr
+make -C "$DOTFILES_DIR/fastabr" fastabr
+cp "$DOTFILES_DIR/fastabr/fastabr" ~/bin/fastabr
+
+xrdb merge ~/.Xresources
+
 # vim-plug
 curl -SsfLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim


@@ 45,21 62,8 @@ curl -SsfLo ~/.zsh/completions/git-completion.zsh --create-dirs \
 # zsh docker completions
 curl -SsfLo ~/.zsh/completions/_docker-compose https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/zsh/_docker-compose 
 
-# setup gitconfig
-git_username="$(git config --get user.name)"
-git_email="$(git config --get user.email)"
-git_config_file="$HOME/.gitconfig"
-rm -f "$git_config_file"
-echo '[user]' >> "$git_config_file"
-echo "    name = $git_username" >> "$git_config_file"
-echo "    email = $git_email" >> "$git_config_file"
-echo "" >> "$git_config_file"
-cat "$DOTFILES_DIR/gitconfig" >> "$git_config_file"
-
-# install fastabr
-make -C "$DOTFILES_DIR/fastabr" fastabr
-cp "$DOTFILES_DIR/fastabr/fastabr" ~/bin/fastabr
-
-xrdb merge ~/.Xresources
+# xfce4 gruvbox theme
+mkdir -p ~/.local/share/xfce4/terminal/colorschemes
+curl -SsfLo ~/.local/share/xfce4/terminal/colorschemes/gruvbox-dark.theme 'https://raw.githubusercontent.com/morhetz/gruvbox-contrib/master/xfce4-terminal/gruvbox-dark.theme'
 
 exit 0

@@ 1,38 1,12 @@
 #!/bin/sh
 
-# .SCRIPTDOC
+set -e
+set -u
 
-# Set appropriet DPMS settings for the current dock state given by
-# ~/.dspool/dock_status, or by a user-provided override.
+# Configure DPMS settings to one of several profiles
 
-# .SYNTAX
+CONFIGURATION="$1"
 
-# $1 . . . (optional) specify DPMS configuration, one of [docked, undocked,
-#          nosleep]
-
-# .LICENSE
-
-# Copyright 2018, Charles A. Daniels
-# This software is distributed under the BSD 3-clause license. The full text
-# of this software's license may be retrieved from this URL:
-# https://github.com/charlesdaniels/dotfiles/blob/master/LICENSE
-
-# .ENDOC
-
-DOCK_STATUS="$(cat ~/.dspool/dock_status)"
-if [ "$DOCK_STATUS" = "DOCKED" ] ; then
-	CONFIGURATION="docked"
-else
-	CONFIGURATION="undocked"
-fi
-
-# this can interfere with our settings
-killall mate-screensaver > /dev/null 2>&1 || true
-
-# if the user provided a directive, use that instead of the inferred one
-if [ $# -ge 1 ] ; then
-	CONFIGURATION="$1"
-fi
 echo "Setting DPMS configuration to $CONFIGURATION"
 
 # not sure this does much on modern systems, but in theory it turns of the