diff options
145 files changed, 0 insertions, 145 deletions
@@ -292,4 +292,3 @@ lint-bin : lint-urxvt: find urxvt/ext -type f -print -exec perlcritic --brutal -- {} \; - diff --git a/README.markdown b/README.markdown index d6c61463..ff7434f4 100644 --- a/README.markdown +++ b/README.markdown @@ -329,4 +329,3 @@ Public domain; see the included `UNLICENSE` file. It’s just configuration, do whatever you like with it if any of it’s useful to you. If you’re feeling generous, you could always [buy me a coffee](https://sanctum.geek.nz/) next time you’re in New Zealand. - @@ -22,4 +22,3 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to <http://unlicense.org/> - diff --git a/X/Xresources b/X/Xresources index 68c949e9..0d66bd47 100644 --- a/X/Xresources +++ b/X/Xresources @@ -40,4 +40,3 @@ URxvt.color12 : #729FCF URxvt.color13 : #AD7FA8 URxvt.color14 : #34E2E2 URxvt.color15 : #EEEEEC - diff --git a/X/redshift.conf b/X/redshift.conf index 196c10d2..1e1de4ee 100644 --- a/X/redshift.conf +++ b/X/redshift.conf @@ -8,4 +8,3 @@ transition=1 [manual] lat=-40.352306 lon=175.608215 - diff --git a/X/xbindkeysrc b/X/xbindkeysrc index 5e5a99ba..a194af58 100644 --- a/X/xbindkeysrc +++ b/X/xbindkeysrc @@ -21,4 +21,3 @@ "exec amixer -q sset Master 5%- unmute" XF86AudioLowerVolume - @@ -30,4 +30,3 @@ xbindkeys -n & # Start window manager exec i3 - diff --git a/abook/abookrc b/abook/abookrc index 92aced99..78d328ee 100644 --- a/abook/abookrc +++ b/abook/abookrc @@ -1,3 +1,2 @@ set sort_field=name set index_format=" {name:32} {email:128}" - diff --git a/bash/bash_completion b/bash/bash_completion index b42dfd77..84ad72eb 100644 --- a/bash/bash_completion +++ b/bash/bash_completion @@ -1,4 +1,3 @@ # This file prevents bash-completion from loading from its /etc/profile.d # script if installed shopt -u progcomp - diff --git a/bash/bash_logout b/bash/bash_logout index 4b8d3943..da758588 100644 --- a/bash/bash_logout +++ b/bash/bash_logout @@ -15,4 +15,3 @@ fi # Write PWD to a file if set printf '%s\n' "$PWD" > "${OLDPWD_FILE:-$HOME/.oldpwd}" - diff --git a/bash/bash_profile b/bash/bash_profile index f89d83f1..8f84597d 100644 --- a/bash/bash_profile +++ b/bash/bash_profile @@ -27,4 +27,3 @@ fi if [[ -e $HOME/.bashrc ]] ; then source "$HOME"/.bashrc fi - diff --git a/bash/bash_profile.d/fortune.bash b/bash/bash_profile.d/fortune.bash index 5105b02d..e4da485d 100644 --- a/bash/bash_profile.d/fortune.bash +++ b/bash/bash_profile.d/fortune.bash @@ -17,4 +17,3 @@ fi fortune -sn "${FORTUNE_MAXSIZE:-768}" "$FORTUNE_PATH" printf '\n' ) - diff --git a/bash/bash_profile.d/remind.bash b/bash/bash_profile.d/remind.bash index 92f13924..a8f14599 100644 --- a/bash/bash_profile.d/remind.bash +++ b/bash/bash_profile.d/remind.bash @@ -20,4 +20,3 @@ fi done < <(rem -hq) printf '\n' ) - diff --git a/bash/bash_profile.d/verse.bash b/bash/bash_profile.d/verse.bash index f463d074..69c48021 100644 --- a/bash/bash_profile.d/verse.bash +++ b/bash/bash_profile.d/verse.bash @@ -22,4 +22,3 @@ fi printf '%s\n' "$date" > "$versefile" fi ) - diff --git a/bash/bashrc b/bash/bashrc index ddd3ce3b..383273c3 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -114,4 +114,3 @@ if [[ -d $HOME/.bashrc.d ]] ; then done unset -v bashrc fi - diff --git a/bash/bashrc.d/apf.bash b/bash/bashrc.d/apf.bash index a9cd115e..8ffa7953 100644 --- a/bash/bashrc.d/apf.bash +++ b/bash/bashrc.d/apf.bash @@ -97,4 +97,3 @@ apf() { # command line as passed to the function command "$cmd" "${args[@]}" "$@" } - diff --git a/bash/bashrc.d/bc.bash b/bash/bashrc.d/bc.bash index 7cad9a52..1a963708 100644 --- a/bash/bashrc.d/bc.bash +++ b/bash/bashrc.d/bc.bash @@ -2,4 +2,3 @@ bc() { command bc -q "$@" } - diff --git a/bash/bashrc.d/bd.bash b/bash/bashrc.d/bd.bash index 20274f56..3850e973 100644 --- a/bash/bashrc.d/bd.bash +++ b/bash/bashrc.d/bd.bash @@ -99,4 +99,3 @@ _bd() { done } complete -F _bd bd - diff --git a/bash/bashrc.d/bell.bash b/bash/bashrc.d/bell.bash index 1107b804..7f8c8444 100644 --- a/bash/bashrc.d/bell.bash +++ b/bash/bashrc.d/bell.bash @@ -2,4 +2,3 @@ bell() { printf '\a' } - diff --git a/bash/bashrc.d/ca.bash b/bash/bashrc.d/ca.bash index bda6c5cb..819cae4c 100644 --- a/bash/bashrc.d/ca.bash +++ b/bash/bashrc.d/ca.bash @@ -2,4 +2,3 @@ ca() { printf '%u\n' "$#" } - diff --git a/bash/bashrc.d/cd.bash b/bash/bashrc.d/cd.bash index 9ccfce57..8557b8c9 100644 --- a/bash/bashrc.d/cd.bash +++ b/bash/bashrc.d/cd.bash @@ -30,4 +30,3 @@ cd() { builtin cd "${opts[@]}" -- "$@" fi } - diff --git a/bash/bashrc.d/cf.bash b/bash/bashrc.d/cf.bash index d006c680..587c44b3 100644 --- a/bash/bashrc.d/cf.bash +++ b/bash/bashrc.d/cf.bash @@ -28,4 +28,3 @@ cf() { ) } complete -A directory cf - diff --git a/bash/bashrc.d/clwr.bash b/bash/bashrc.d/clwr.bash index a12ced4c..455484d9 100644 --- a/bash/bashrc.d/clwr.bash +++ b/bash/bashrc.d/clwr.bash @@ -6,4 +6,3 @@ clwr() { printf '%s\n' "$line" done } - diff --git a/bash/bashrc.d/completion.bash b/bash/bashrc.d/completion.bash index 25bae147..5d944b9b 100644 --- a/bash/bashrc.d/completion.bash +++ b/bash/bashrc.d/completion.bash @@ -36,4 +36,3 @@ complete -A variable declare export readonly typeset # Both functions and variables complete -A function -A variable unset - diff --git a/bash/bashrc.d/diff.bash b/bash/bashrc.d/diff.bash index d1567d17..2c752c8d 100644 --- a/bash/bashrc.d/diff.bash +++ b/bash/bashrc.d/diff.bash @@ -2,4 +2,3 @@ diff() { command diff -u "$@" } - diff --git a/bash/bashrc.d/ed.bash b/bash/bashrc.d/ed.bash index faee7205..0f069b85 100644 --- a/bash/bashrc.d/ed.bash +++ b/bash/bashrc.d/ed.bash @@ -27,4 +27,3 @@ ed() { # concluded options command "${wrap[@]}" ed "${opts[@]}" "$@" } - diff --git a/bash/bashrc.d/fnl.bash b/bash/bashrc.d/fnl.bash index 50bf7a31..b63d64b1 100644 --- a/bash/bashrc.d/fnl.bash +++ b/bash/bashrc.d/fnl.bash @@ -42,4 +42,3 @@ fnl() { # Return the exit status of the command, not the declare builtin return "$ret" } - diff --git a/bash/bashrc.d/ftp.bash b/bash/bashrc.d/ftp.bash index 4b4b63eb..5770f137 100644 --- a/bash/bashrc.d/ftp.bash +++ b/bash/bashrc.d/ftp.bash @@ -31,4 +31,3 @@ _ftp() { done } complete -F _ftp -o default ftp - diff --git a/bash/bashrc.d/gdb.bash b/bash/bashrc.d/gdb.bash index 3c9ed4a6..ec9d4137 100644 --- a/bash/bashrc.d/gdb.bash +++ b/bash/bashrc.d/gdb.bash @@ -2,4 +2,3 @@ gdb() { command gdb -q "$@" } - diff --git a/bash/bashrc.d/git.bash b/bash/bashrc.d/git.bash index 7ac0524d..496712ae 100644 --- a/bash/bashrc.d/git.bash +++ b/bash/bashrc.d/git.bash @@ -25,4 +25,3 @@ _git() { esac } complete -F _git -o default git - diff --git a/bash/bashrc.d/gpg.bash b/bash/bashrc.d/gpg.bash index c2340520..446475dc 100644 --- a/bash/bashrc.d/gpg.bash +++ b/bash/bashrc.d/gpg.bash @@ -29,4 +29,3 @@ _gpg() { done < <(gpg --dump-options 2>/dev/null) } complete -F _gpg -o default gpg - diff --git a/bash/bashrc.d/grep.bash b/bash/bashrc.d/grep.bash index 6a567e5a..11eeb5b0 100644 --- a/bash/bashrc.d/grep.bash +++ b/bash/bashrc.d/grep.bash @@ -31,4 +31,3 @@ unset -v grep_help colors grep() { command grep "${GREPOPTS[@]}" "$@" } - diff --git a/bash/bashrc.d/hgrep.bash b/bash/bashrc.d/hgrep.bash index 3d0d0589..855fbcc8 100644 --- a/bash/bashrc.d/hgrep.bash +++ b/bash/bashrc.d/hgrep.bash @@ -6,4 +6,3 @@ hgrep() { grep "${@:?}" "${HISTFILE:?}" } - diff --git a/bash/bashrc.d/keep.bash b/bash/bashrc.d/keep.bash index dd130b36..53b7c5bb 100644 --- a/bash/bashrc.d/keep.bash +++ b/bash/bashrc.d/keep.bash @@ -157,4 +157,3 @@ if [[ -d ${BASHKEEP:-$HOME/.bashkeep.d} ]] ; then done unset -v bashkeep fi - diff --git a/bash/bashrc.d/keychain.bash b/bash/bashrc.d/keychain.bash index a8585b6b..40fe5d71 100644 --- a/bash/bashrc.d/keychain.bash +++ b/bash/bashrc.d/keychain.bash @@ -2,4 +2,3 @@ if [[ -n $GPG_TTY ]] ; then GPG_TTY=$(tty) fi - diff --git a/bash/bashrc.d/ls.bash b/bash/bashrc.d/ls.bash index cd23bbe9..4b647163 100644 --- a/bash/bashrc.d/ls.bash +++ b/bash/bashrc.d/ls.bash @@ -18,4 +18,3 @@ unset -v colors ls() { command ls "${LSOPTS[@]}" "$@" } - diff --git a/bash/bashrc.d/make.bash b/bash/bashrc.d/make.bash index d499649f..2359d125 100644 --- a/bash/bashrc.d/make.bash +++ b/bash/bashrc.d/make.bash @@ -28,4 +28,3 @@ _make() { done } complete -F _make -o default make - diff --git a/bash/bashrc.d/man.bash b/bash/bashrc.d/man.bash index 99c38b67..562b0625 100644 --- a/bash/bashrc.d/man.bash +++ b/bash/bashrc.d/man.bash @@ -61,4 +61,3 @@ _man() { ) } complete -F _man -o default man - diff --git a/bash/bashrc.d/md.bash b/bash/bashrc.d/md.bash index d32cf488..1b2a3b30 100644 --- a/bash/bashrc.d/md.bash +++ b/bash/bashrc.d/md.bash @@ -2,4 +2,3 @@ md() { mkdir -p -- "$@" } - diff --git a/bash/bashrc.d/mkcd.bash b/bash/bashrc.d/mkcd.bash index d251095a..2d596641 100644 --- a/bash/bashrc.d/mkcd.bash +++ b/bash/bashrc.d/mkcd.bash @@ -3,4 +3,3 @@ mkcd() { mkdir -p -- "$1" && builtin cd -- "$1" } complete -A directory mkcd - diff --git a/bash/bashrc.d/mkcp.bash b/bash/bashrc.d/mkcp.bash index 7770556a..59eb0355 100644 --- a/bash/bashrc.d/mkcp.bash +++ b/bash/bashrc.d/mkcp.bash @@ -2,4 +2,3 @@ mkcp() { mkdir -p -- "${@: -1}" && cp -- "$@" } - diff --git a/bash/bashrc.d/mkmv.bash b/bash/bashrc.d/mkmv.bash index 48be8cb9..014fa150 100644 --- a/bash/bashrc.d/mkmv.bash +++ b/bash/bashrc.d/mkmv.bash @@ -2,4 +2,3 @@ mkmv() { mkdir -p -- "${@: -1}" && mv -- "$@" } - diff --git a/bash/bashrc.d/mysql.bash b/bash/bashrc.d/mysql.bash index e967e3b0..6575e096 100644 --- a/bash/bashrc.d/mysql.bash +++ b/bash/bashrc.d/mysql.bash @@ -55,4 +55,3 @@ _mysql() { ) } complete -F _mysql -o default mysql - diff --git a/bash/bashrc.d/pa.bash b/bash/bashrc.d/pa.bash index a2529968..5f963818 100644 --- a/bash/bashrc.d/pa.bash +++ b/bash/bashrc.d/pa.bash @@ -4,4 +4,3 @@ pa() { printf '%s\n' "$@" fi } - diff --git a/bash/bashrc.d/pass.bash b/bash/bashrc.d/pass.bash index cc323086..28484761 100644 --- a/bash/bashrc.d/pass.bash +++ b/bash/bashrc.d/pass.bash @@ -37,4 +37,3 @@ _pass() ) } complete -F _pass pass - diff --git a/bash/bashrc.d/path.bash b/bash/bashrc.d/path.bash index 39d9e453..d705b0ca 100644 --- a/bash/bashrc.d/path.bash +++ b/bash/bashrc.d/path.bash @@ -240,4 +240,3 @@ _path() { } complete -F _path path - diff --git a/bash/bashrc.d/paz.bash b/bash/bashrc.d/paz.bash index 99907298..def70f8d 100644 --- a/bash/bashrc.d/paz.bash +++ b/bash/bashrc.d/paz.bash @@ -5,4 +5,3 @@ paz() { printf '%s\0' "$@" fi } - diff --git a/bash/bashrc.d/pd.bash b/bash/bashrc.d/pd.bash index 1dbf7d39..47a317e0 100644 --- a/bash/bashrc.d/pd.bash +++ b/bash/bashrc.d/pd.bash @@ -51,4 +51,3 @@ pd() { return 2 fi } - diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 23870d51..d4ec0645 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -277,4 +277,3 @@ complete -W 'on off git hg svn vcs ret job' prompt # Start with full-fledged prompt prompt on - diff --git a/bash/bashrc.d/pushd.bash b/bash/bashrc.d/pushd.bash index c3e01a5e..6c8a2174 100644 --- a/bash/bashrc.d/pushd.bash +++ b/bash/bashrc.d/pushd.bash @@ -2,4 +2,3 @@ pushd() { builtin pushd "${@:-$HOME}" } - diff --git a/bash/bashrc.d/pwgen.bash b/bash/bashrc.d/pwgen.bash index 2d68e05c..f57d1884 100644 --- a/bash/bashrc.d/pwgen.bash +++ b/bash/bashrc.d/pwgen.bash @@ -7,4 +7,3 @@ pwgen() { command pwgen --secure -- "${PWGEN_LENGTH:-15}" "${PWGEN_COUNT:-1}" fi } - diff --git a/bash/bashrc.d/rcsdiff.bash b/bash/bashrc.d/rcsdiff.bash index 93966cc6..18b1d324 100644 --- a/bash/bashrc.d/rcsdiff.bash +++ b/bash/bashrc.d/rcsdiff.bash @@ -2,4 +2,3 @@ rcsdiff() { command rcsdiff -u "$@" } - diff --git a/bash/bashrc.d/readv.bash b/bash/bashrc.d/readv.bash index 5013dd89..abd624a4 100644 --- a/bash/bashrc.d/readv.bash +++ b/bash/bashrc.d/readv.bash @@ -23,4 +23,3 @@ readv() { "$FUNCNAME" "$name" "${!name}" done } - diff --git a/bash/bashrc.d/readz.bash b/bash/bashrc.d/readz.bash index 4b35979c..78a178b6 100644 --- a/bash/bashrc.d/readz.bash +++ b/bash/bashrc.d/readz.bash @@ -2,4 +2,3 @@ readz() { builtin read -d '' -r "$@" } - diff --git a/bash/bashrc.d/scp.bash b/bash/bashrc.d/scp.bash index 89cd2809..cd2f8521 100644 --- a/bash/bashrc.d/scp.bash +++ b/bash/bashrc.d/scp.bash @@ -8,4 +8,3 @@ scp() { fi command scp "$@" } - diff --git a/bash/bashrc.d/scr.bash b/bash/bashrc.d/scr.bash index d7248dbc..046b8691 100644 --- a/bash/bashrc.d/scr.bash +++ b/bash/bashrc.d/scr.bash @@ -10,4 +10,3 @@ scr() { return 2 fi } - diff --git a/bash/bashrc.d/sd.bash b/bash/bashrc.d/sd.bash index 33e0a033..b65d207d 100644 --- a/bash/bashrc.d/sd.bash +++ b/bash/bashrc.d/sd.bash @@ -147,4 +147,3 @@ _sd() { ) } complete -F _sd sd - diff --git a/bash/bashrc.d/sprunge.bash b/bash/bashrc.d/sprunge.bash index 6c0cef42..34406b0d 100644 --- a/bash/bashrc.d/sprunge.bash +++ b/bash/bashrc.d/sprunge.bash @@ -3,4 +3,3 @@ sprunge() { curl -F 'sprunge=<-' http://sprunge.us < "${1:-/dev/stdin}" } - diff --git a/bash/bashrc.d/ssh.bash b/bash/bashrc.d/ssh.bash index 40327b43..bbb9b246 100644 --- a/bash/bashrc.d/ssh.bash +++ b/bash/bashrc.d/ssh.bash @@ -20,4 +20,3 @@ _ssh() { done } complete -F _ssh -o default ssh sftp ssh-copy-id - diff --git a/bash/bashrc.d/sudo.bash b/bash/bashrc.d/sudo.bash index 41a97a9e..5bb8906a 100644 --- a/bash/bashrc.d/sudo.bash +++ b/bash/bashrc.d/sudo.bash @@ -6,4 +6,3 @@ sudo() { command sudo -H "$@" fi } - diff --git a/bash/bashrc.d/tmux.bash b/bash/bashrc.d/tmux.bash index 200001da..c70a7908 100644 --- a/bash/bashrc.d/tmux.bash +++ b/bash/bashrc.d/tmux.bash @@ -14,4 +14,3 @@ tmux() { command tmux new-session -s "${TMUX_SESSION:-default}" fi } - diff --git a/bash/bashrc.d/ud.bash b/bash/bashrc.d/ud.bash index 75768cc3..0e01dfd0 100644 --- a/bash/bashrc.d/ud.bash +++ b/bash/bashrc.d/ud.bash @@ -77,4 +77,3 @@ _ud() { ) } complete -F _ud -o filenames ud - diff --git a/bash/bashrc.d/vared.bash b/bash/bashrc.d/vared.bash index 6f2803f1..940b0900 100644 --- a/bash/bashrc.d/vared.bash +++ b/bash/bashrc.d/vared.bash @@ -29,4 +29,3 @@ vared() { done } complete -A variable vared - diff --git a/bash/bashrc.d/vim.bash b/bash/bashrc.d/vim.bash index ccfbcb01..37fc1871 100644 --- a/bash/bashrc.d/vim.bash +++ b/bash/bashrc.d/vim.bash @@ -13,4 +13,3 @@ vi() { view() { vim -R "$@" } - diff --git a/bash/bashrc.d/vis.bash b/bash/bashrc.d/vis.bash index 93b4098c..0a0d861e 100644 --- a/bash/bashrc.d/vis.bash +++ b/bash/bashrc.d/vis.bash @@ -20,4 +20,3 @@ _vis() { ) } complete -F _vis vis - diff --git a/bash/bashrc.d/vr.bash b/bash/bashrc.d/vr.bash index c63e174e..bbb37758 100644 --- a/bash/bashrc.d/vr.bash +++ b/bash/bashrc.d/vr.bash @@ -58,4 +58,3 @@ vr() { return 1 } complete -A directory vr - @@ -62,4 +62,3 @@ cat > "$stdin" for file ; do ed "${opts[@]}" -- "$file" < "$stdin" done - @@ -54,4 +54,3 @@ if (($# == 1)) && \ else man "$@" fi - @@ -92,4 +92,3 @@ done # Exit with the determined value exit "$ret" - @@ -79,4 +79,3 @@ else "$self" 'Failure!' exit 1 fi - diff --git a/bin/scatter b/bin/scatter index 75604491..bab4ec32 100755 --- a/bin/scatter +++ b/bin/scatter @@ -32,4 +32,3 @@ while read -r hostname <&3 ; do ssh -qt -- "$hostname" "$@" printf '\n' done 3< <(shoal) - @@ -35,4 +35,3 @@ while read -r option value _ ; do ;; esac done < "${1:-$HOME/.ssh/config}" - @@ -32,4 +32,3 @@ while read -r hostname ; do printf '%s\n' "$hostname" fi done < <(shoal) - @@ -60,4 +60,3 @@ done # If we got this far, there's at least one file and all the files are owned by # the same user; we can safely edit them exec sudoedit -u "$user" -- "$@" - @@ -56,4 +56,3 @@ message=$(printf 'Changed by %s(1)' "$self") if ! git diff-index --quiet HEAD ; then git commit --message "$message" --quiet fi - @@ -65,4 +65,3 @@ for file in "$@" ; do printf '%s%s%s\n' "$prefix" "$line" "$suffix" done < "$file" done - @@ -100,4 +100,3 @@ fi "$@" \ 2> >(tl -p "$stderr_prefix" -s "$stderr_suffix") \ 1> >(tl -p "$stdout_prefix" -s "$stdout_suffix") - @@ -115,4 +115,3 @@ done # the failures and exit with the non-zero exit value of the most recent one cat -- "$errbuf" >&2 exit "$ret" - @@ -72,4 +72,3 @@ for creation in "${creations[@]}" ; do [[ -f $creation ]] || continue chmod +x -- "$creation" done - @@ -30,4 +30,3 @@ rbg=$(shuf -en1 "${bgs[@]}") || exit 1 # Apply it as the background and we're done feh --bg-scale --no-fehbg -- "$rbg" - diff --git a/curl/curlrc b/curl/curlrc index bb393905..1f373902 100644 --- a/curl/curlrc +++ b/curl/curlrc @@ -5,4 +5,3 @@ referer = ";auto" silent show-error netrc - diff --git a/dunst/dunstrc b/dunst/dunstrc index def86e04..ea4a6392 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -45,4 +45,3 @@ background = "#900000" foreground = "#ffffff" timeout = 0 - diff --git a/git/gitconfig b/git/gitconfig index d8f56334..bf278153 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -34,4 +34,3 @@ [push] default = matching - diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index 628f1b96..c50602c5 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -1,3 +1,2 @@ # Cache keys for two hours default-cache-ttl 7200 - diff --git a/gnupg/gpg.conf.m4 b/gnupg/gpg.conf.m4 index 81a95f3d..8531a742 100644 --- a/gnupg/gpg.conf.m4 +++ b/gnupg/gpg.conf.m4 @@ -50,4 +50,3 @@ verify-options pka-lookups show-uid-validity # Assume "yes" is the answer to most questions, that is, don't keep asking me # to confirm something I've asked to be done yes - diff --git a/gnupg/sks-keyservers.net/README.markdown b/gnupg/sks-keyservers.net/README.markdown index 12e77619..bb19e80e 100644 --- a/gnupg/sks-keyservers.net/README.markdown +++ b/gnupg/sks-keyservers.net/README.markdown @@ -7,4 +7,3 @@ your responsibility to make sure that everything here is verified to your satisfaction. [1]: https://sks-keyservers.net/overview-of-pools.php - diff --git a/gtk/gtkrc-2.0 b/gtk/gtkrc-2.0 index dfcf8fd9..99fb22e2 100644 --- a/gtk/gtkrc-2.0 +++ b/gtk/gtkrc-2.0 @@ -1,2 +1 @@ gtk-theme-name = "Clearlooks-Phenix" - diff --git a/gtk/gtkrc-3.0/settings.ini b/gtk/gtkrc-3.0/settings.ini index 42ca146c..4f93dfe4 100644 --- a/gtk/gtkrc-3.0/settings.ini +++ b/gtk/gtkrc-3.0/settings.ini @@ -1,3 +1,2 @@ [Settings] gtk-theme-name = Clearlooks-Phenix - @@ -99,4 +99,3 @@ bar { urgent_workspace #ffffff #900000 } } - @@ -15,4 +15,3 @@ battery 0 { path = "/sys/class/power_supply/BAT%d/uevent" low_threshold = 15 } - diff --git a/man/man1/edda.1 b/man/man1/edda.1 index 2a7ef501..21e6b163 100644 --- a/man/man1/edda.1 +++ b/man/man1/edda.1 @@ -27,4 +27,3 @@ options over each of the files given as the remaining arguments. Example: ed(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/han.1 b/man/man1/han.1 index 8bb65be4..efa72645 100644 --- a/man/man1/han.1 +++ b/man/man1/han.1 @@ -15,4 +15,3 @@ you can then use the K normal-mode binding over both shell builtins (e.g. read, set, export) and external programs (e.g. cat(1), grep(1), ed(1)). .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/igex.1 b/man/man1/igex.1 index 464070aa..1c2396d4 100644 --- a/man/man1/igex.1 +++ b/man/man1/igex.1 @@ -17,4 +17,3 @@ integer. $ igex -v -i24 rsync source dest .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/maybe.1 b/man/man1/maybe.1 index 0fdbb545..9fd90c8b 100644 --- a/man/man1/maybe.1 +++ b/man/man1/maybe.1 @@ -22,4 +22,3 @@ of success or failure). true(1), false(1), try(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/scatter.1 b/man/man1/scatter.1 index 95addd23..9d0beefc 100644 --- a/man/man1/scatter.1 +++ b/man/man1/scatter.1 @@ -13,4 +13,3 @@ hostname, stdout, and stderr for each call. shock(1), shoal(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/shoal.1 b/man/man1/shoal.1 index 2399f974..1ece346f 100644 --- a/man/man1/shoal.1 +++ b/man/man1/shoal.1 @@ -15,4 +15,3 @@ scatter(1). scatter(1), shock(1), ssh(1), ssh_config(5) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/shock.1 b/man/man1/shock.1 index 0b64d504..9864c451 100644 --- a/man/man1/shock.1 +++ b/man/man1/shock.1 @@ -14,4 +14,3 @@ discarded. scatter(1), shoal(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/td.1 b/man/man1/td.1 index 74c64026..713555ce 100644 --- a/man/man1/td.1 +++ b/man/man1/td.1 @@ -11,4 +11,3 @@ to ~/Todo/todo.markdown), and automatically maintain a changelog via git(1). git(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/tl.1 b/man/man1/tl.1 index 7560debb..9e82d3a3 100644 --- a/man/man1/tl.1 +++ b/man/man1/tl.1 @@ -18,4 +18,3 @@ file arguments are given, defaults to reading standard input. tlcs(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/tlcs.1 b/man/man1/tlcs.1 index 4c39612e..aba6a03b 100644 --- a/man/man1/tlcs.1 +++ b/man/man1/tlcs.1 @@ -21,4 +21,3 @@ arguments. tl(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/try.1 b/man/man1/try.1 index 89e893b4..6eb8bacc 100644 --- a/man/man1/try.1 +++ b/man/man1/try.1 @@ -19,4 +19,3 @@ arguments are the command to run. maybe(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/vis.1 b/man/man1/vis.1 index a2d8a66f..588cedb2 100644 --- a/man/man1/vis.1 +++ b/man/man1/vis.1 @@ -13,4 +13,3 @@ Create and edit executable scripts in a directory VISPATH (defaults to $ EDITOR=vim vis -O tabone tabtwo .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man1/xrbg.1 b/man/man1/xrbg.1 index 04e3c2b5..cb132c6d 100644 --- a/man/man1/xrbg.1 +++ b/man/man1/xrbg.1 @@ -17,4 +17,3 @@ work when called manually from within an X session too. feh(1), shuf(1) .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/man/man8/sue.8 b/man/man8/sue.8 index 257493df..a7701d23 100644 --- a/man/man8/sue.8 +++ b/man/man8/sue.8 @@ -12,4 +12,3 @@ situations where you don't have full root access via sudo(8), or simply want to be strict about working with least privilege. .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> - diff --git a/mutt/muttrc b/mutt/muttrc index a086ef40..cba77147 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -129,4 +129,3 @@ macro generic,index,browser,pager gm '!getmails<enter>' 'Run getmails' # Shortcut to add addresses to abook macro index,pager A '<pipe-message>abook --add-email<enter>' 'Add sender address to abook' - diff --git a/mysql/my.cnf b/mysql/my.cnf index 73862800..e0df3c23 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -3,4 +3,3 @@ default-character-set=utf8 no-auto-rehash prompt='(\u@\h:\d) mysql> ' safe-updates - diff --git a/ncmpcpp/config b/ncmpcpp/config index cf384f9c..eb4f2120 100644 --- a/ncmpcpp/config +++ b/ncmpcpp/config @@ -29,4 +29,3 @@ song_columns_list_format = "(40)[]{t|f} (25)[blue]{a} (25)[red]{b} (10)[gree # Don't let me actually delete anything allow_physical_directories_deletion = "no" allow_physical_files_deletion = "no" - diff --git a/newsbeuter/config b/newsbeuter/config index 8f1bda43..48f4110a 100644 --- a/newsbeuter/config +++ b/newsbeuter/config @@ -15,4 +15,3 @@ color listfocus default default reverse color listfocus_unread default default reverse color listnormal default default color listnormal_unread default default - diff --git a/perlcritic/perlcriticrc b/perlcritic/perlcriticrc index 071767e4..c079df22 100644 --- a/perlcritic/perlcriticrc +++ b/perlcritic/perlcriticrc @@ -2,4 +2,3 @@ severity = brutal [Bangs::ProhibitNumberedNames] exceptions = inet4 inet6 ipv4 ipv6 md5 sha1 sha256 sha512 x11 utf8 - diff --git a/psql/psqlrc b/psql/psqlrc index 1437cec9..f07e41ae 100644 --- a/psql/psqlrc +++ b/psql/psqlrc @@ -3,4 +3,3 @@ \set HISTSIZE 1000000 \set PROMPT1 '(%n@%M:%/) psql> ' \timing - diff --git a/readline/inputrc b/readline/inputrc index c4c1eb4f..6a9870a2 100644 --- a/readline/inputrc +++ b/readline/inputrc @@ -51,4 +51,3 @@ $if Bash # Alt-T (for todo) to edit my to-do file with td(1) "\et": "\C-atd\C-j\C-y" $endif - @@ -12,4 +12,3 @@ if [ -d "$HOME"/.profile.d ] ; then done unset -v profile fi - diff --git a/sh/profile.d/browser.sh b/sh/profile.d/browser.sh index 19d3d94c..6adbacfe 100644 --- a/sh/profile.d/browser.sh +++ b/sh/profile.d/browser.sh @@ -1,4 +1,3 @@ # Browser BROWSER=lynx export BROWSER - diff --git a/sh/profile.d/editor.sh b/sh/profile.d/editor.sh index 92535aeb..7ed9e262 100644 --- a/sh/profile.d/editor.sh +++ b/sh/profile.d/editor.sh @@ -2,4 +2,3 @@ EDITOR=vi VISUAL=$EDITOR export EDITOR VISUAL - diff --git a/sh/profile.d/go.sh b/sh/profile.d/go.sh index 592b651e..86bf9994 100644 --- a/sh/profile.d/go.sh +++ b/sh/profile.d/go.sh @@ -6,4 +6,3 @@ export GOPATH if [ -d "$GOPATH"/bin ] ; then PATH=$GOPATH/bin:$PATH fi - diff --git a/sh/profile.d/grep.sh b/sh/profile.d/grep.sh index 4e27b087..224fd206 100644 --- a/sh/profile.d/grep.sh +++ b/sh/profile.d/grep.sh @@ -11,4 +11,3 @@ esac # We're done parsing grep(1)'s --help output now unset -v grep_help - diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh index cde71792..55306ad4 100644 --- a/sh/profile.d/keychain.sh +++ b/sh/profile.d/keychain.sh @@ -15,4 +15,3 @@ if command -v keychain >/dev/null 2>&1 ; then export GPG_TTY fi fi - diff --git a/sh/profile.d/ls.sh b/sh/profile.d/ls.sh index a477c510..a3cc84b7 100644 --- a/sh/profile.d/ls.sh +++ b/sh/profile.d/ls.sh @@ -16,4 +16,3 @@ esac # We're done parsing ls(1)'s --help output now unset -v ls_help - diff --git a/sh/profile.d/oldpwd.sh b/sh/profile.d/oldpwd.sh index f1dc7746..91dd1dba 100644 --- a/sh/profile.d/oldpwd.sh +++ b/sh/profile.d/oldpwd.sh @@ -3,4 +3,3 @@ if [ -r "${OLDPWD_FILE:-$HOME/.oldpwd}" ] ; then IFS= read -r OLDPWD < "${OLDPWD_FILE:-$HOME/.oldpwd}" export OLDPWD fi - diff --git a/sh/profile.d/timezone.sh b/sh/profile.d/timezone.sh index 2625a912..cbd33539 100644 --- a/sh/profile.d/timezone.sh +++ b/sh/profile.d/timezone.sh @@ -1,4 +1,3 @@ # Timezone TZ=Pacific/Auckland export TZ - diff --git a/subversion/config b/subversion/config index ca6fbb7d..fe6f96c6 100644 --- a/subversion/config +++ b/subversion/config @@ -9,4 +9,3 @@ global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo *.rej [auto-props] *.jpg = svn:mime-type=image/jpeg *.png = svn:mime-type=image/png - diff --git a/terminfo/putty.info b/terminfo/putty.info index 6db9155a..3f2ab27f 100644 --- a/terminfo/putty.info +++ b/terminfo/putty.info @@ -134,4 +134,3 @@ putty-256color| PuTTY with 256 colors, pairs#32767, setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, - diff --git a/terminfo/rxvt.info b/terminfo/rxvt.info index 9ce8cb39..735c7ef7 100644 --- a/terminfo/rxvt.info +++ b/terminfo/rxvt.info @@ -324,4 +324,3 @@ rxvt-unicode-256color| rxvt-unicode with 256 colors, use=rxvt-unicode, colors#256, pairs#32767, - diff --git a/terminfo/screen.info b/terminfo/screen.info index dbe6935f..574e78e0 100644 --- a/terminfo/screen.info +++ b/terminfo/screen.info @@ -106,4 +106,3 @@ screen-256color| GNU Screen or tmux with 256 colors, pairs#32767, setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, - diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 5fe7941e..e9746671 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -135,4 +135,3 @@ set-window-option -g window-status-current-style "fg=colour231" # A window with a bell has a title with a red background until cleared set-window-option -g window-status-bell-style "bg=colour9" - diff --git a/urxvt/ext/clip b/urxvt/ext/clip index 94641d4a..cb2b1a27 100644 --- a/urxvt/ext/clip +++ b/urxvt/ext/clip @@ -29,4 +29,3 @@ sub clip { or croak('Failed to close xsel(1) pipe'); return $written; } - diff --git a/vim/after/ftdetect/diff.vim b/vim/after/ftdetect/diff.vim index 2c6037f5..c9df9184 100644 --- a/vim/after/ftdetect/diff.vim +++ b/vim/after/ftdetect/diff.vim @@ -2,4 +2,3 @@ autocmd BufNewFile,BufRead \ nwatch.diff.* \ setlocal filetype=diff - diff --git a/vim/after/ftdetect/sh.vim b/vim/after/ftdetect/sh.vim index 20bfb2c2..26a2c14e 100644 --- a/vim/after/ftdetect/sh.vim +++ b/vim/after/ftdetect/sh.vim @@ -24,4 +24,3 @@ autocmd BufNewFile,BufRead \ **/.dotfiles/bash/** \ let g:is_bash = 1 | \ setlocal filetype=sh - diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim index ef7720e1..38b71656 100644 --- a/vim/after/ftplugin/html.vim +++ b/vim/after/ftplugin/html.vim @@ -9,4 +9,3 @@ function! UrlLink() execute "normal a</a>\<Esc>" endfunction nnoremap <silent> <leader>r :<C-U>call UrlLink()<CR> - diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim index 62e3cff9..35432b96 100644 --- a/vim/after/ftplugin/mail.vim +++ b/vim/after/ftplugin/mail.vim @@ -1,3 +1,2 @@ " Use trailing whitespace to denote continued paragraph setlocal formatoptions+=w - diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index e06bf467..dad2ce35 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -4,4 +4,3 @@ nnoremap <leader>pc :exe "!perl -c " . shellescape(expand("%"))<CR> nnoremap <leader>pl :exe "!perlcritic " . shellescape(expand("%"))<CR> " Run the current buffer through perltidy nnoremap <leader>pt :%!perltidy<CR> - diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 2f333cb5..8af94d90 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -6,4 +6,3 @@ let g:sh_isk='@,48-57,_,192-255,.,/' if exists('b:is_bash') && executable('han') setlocal keywordprg=han endif - diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim index 1a8fbd17..10301ce0 100644 --- a/vim/after/ftplugin/vim.vim +++ b/vim/after/ftplugin/vim.vim @@ -2,4 +2,3 @@ set shiftwidth=2 set softtabstop=2 set tabstop=2 - diff --git a/vim/after/indent/php.vim b/vim/after/indent/php.vim index c36c7ff1..b4147c32 100644 --- a/vim/after/indent/php.vim +++ b/vim/after/indent/php.vim @@ -2,4 +2,3 @@ " often than it helps me; turn it off and just use autoindent setlocal autoindent setlocal indentexpr= - diff --git a/vim/after/plugin/netrw.vim b/vim/after/plugin/netrw.vim index 6afafb67..528f0ca6 100644 --- a/vim/after/plugin/netrw.vim +++ b/vim/after/plugin/netrw.vim @@ -9,4 +9,3 @@ let g:netrw_liststyle = 3 " Don't list the current directory shortcut, and don't show tags files let g:netrw_list_hide = '^\.$,^tags$' - diff --git a/vim/after/syntax/html.vim b/vim/after/syntax/html.vim index 72b79a0b..80012114 100644 --- a/vim/after/syntax/html.vim +++ b/vim/after/syntax/html.vim @@ -1,4 +1,3 @@ " Make HTML highlighting a bit less visually noisy highlight! link htmlTag Type highlight! link htmlEndTag htmlTag - diff --git a/vim/after/syntax/mail.vim b/vim/after/syntax/mail.vim index 575b3a28..42abfeb7 100644 --- a/vim/after/syntax/mail.vim +++ b/vim/after/syntax/mail.vim @@ -8,4 +8,3 @@ highlight! link mailQuoted3 NONE highlight! link mailQuoted4 NONE highlight! link mailQuoted5 NONE highlight! link mailQuoted6 NONE - diff --git a/vim/after/syntax/messages.vim b/vim/after/syntax/messages.vim index 60d1f9c4..a1f97d1f 100644 --- a/vim/after/syntax/messages.vim +++ b/vim/after/syntax/messages.vim @@ -1,4 +1,3 @@ " The highlighting for errors in syslog/messages files is more often annoying " than useful, so just turn it off. highlight! link messagesError NONE - diff --git a/vim/after/syntax/php.vim b/vim/after/syntax/php.vim index fb29b555..139e9d36 100644 --- a/vim/after/syntax/php.vim +++ b/vim/after/syntax/php.vim @@ -1,3 +1,2 @@ " Make PHP highlighting a bit less visually noisy highlight! link phpVarSelector phpIdentifier - diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim index 59ff92d7..37ad8518 100644 --- a/vim/after/syntax/sh.vim +++ b/vim/after/syntax/sh.vim @@ -75,4 +75,3 @@ syntax keyword bashStatement \ umask \ unalias \ wait - @@ -14,4 +14,3 @@ set guioptions=aci " When the GUI starts, t_vb is reset to its default value, so it's necessary " to repeat this line from my .vimrc file that turns off visual bells set visualbell t_vb= - @@ -583,4 +583,3 @@ if has('eval') && has('autocmd') autocmd BufReadPre * call BigFileMeasures() augroup end endif - diff --git a/wyrd/wyrdrc b/wyrd/wyrdrc index 8abd2b8b..86eae455 100644 --- a/wyrd/wyrdrc +++ b/wyrd/wyrdrc @@ -165,4 +165,3 @@ color calendar_level3 red black color calendar_today magenta white color left_divider magenta magenta color right_divider magenta magenta - diff --git a/zsh/zprofile b/zsh/zprofile index 69a77813..b61ca248 100644 --- a/zsh/zprofile +++ b/zsh/zprofile @@ -1,2 +1 @@ exec bash -l - @@ -1,2 +1 @@ exec bash - |