From 00771b2031cf2fdb86ef79617fcc7a872949d4a8 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Wed, 23 Sep 2015 17:21:08 -0700 Subject: [PATCH 01/10] Move ^S/^Q control to .zshrc so no errors during xprofile. --- dotfiles/profile | 4 ---- dotfiles/zshrc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dotfiles/profile b/dotfiles/profile index 1126332..9f3c2e5 100644 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -32,10 +32,6 @@ for p in "${EXTRA_PATHS[@]}" ; do done unset EXTRA_PATHS -# Disable stty ctrl-s/ctrl-q behavior -stty stop undef -stty start undef - # Setup GPG Agent GPG_AGENT_INFO_PATH=$HOME/.gnupg/gpg-agent-info-`hostname` if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2>/dev/null ; then diff --git a/dotfiles/zshrc b/dotfiles/zshrc index e67a20e..5e17935 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -2,7 +2,7 @@ HISTFILE=~/.histfile HISTSIZE=1000 SAVEHIST=1000 setopt appendhistory autocd autopushd extendedglob nohup nomatch histignorespace histlexwords histverify cbases -unsetopt beep +unsetopt beep histbeep listbeep flowcontrol bindkey -e # Completion From 1730ce999456cae723435e58d82774f9a85d0510 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Wed, 23 Sep 2015 19:43:08 -0700 Subject: [PATCH 02/10] More packages. --- packages | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages b/packages index 172ad51..cda71ec 100644 --- a/packages +++ b/packages @@ -7,3 +7,7 @@ ack-grep tmux gnupg2 gnupg-agent +curl +strace +ltrace +traceroute From 93b33f668f83e55d5b838dda88427c5016c82ddf Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Wed, 23 Sep 2015 20:21:11 -0700 Subject: [PATCH 03/10] Update gitconfig options. --- dotfiles/gitconfig | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 966596a..274442e 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -1,15 +1,38 @@ [user] name = David Tomaschik email = david@systemoverlord.com -[push] - default = current + signingKey = 0x5DEA789B + [core] excludesfile = ~/.gitignore + editor = vim + whitespace = trailing-space,space-before-tab + +[color] + diff = auto + status = auto + +[diff] + tool = vimdiff + +[difftool] + prompt = false + +[alias] + st = status + +[push] + default = current + [web] browser = chrome + [github] user = matir + +# Site specific config [url "https://github.com/"] insteadOf = github:// + [url "ssh://git@github.com/"] pushInsteadOf = github:// From d4ad0603e303c7f12d9f715459fc49503a08b866 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 24 Sep 2015 07:50:57 -0700 Subject: [PATCH 04/10] Add gist urls to gitconfig. --- dotfiles/gitconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 274442e..1eba29e 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -36,3 +36,10 @@ [url "ssh://git@github.com/"] pushInsteadOf = github:// + +[url "git://gist.github.com/"] + insteadOf = "gist:" + +[url "git@gist.github.com:"] + pushInsteadOf = "gist:" + pushInsteadOf = "git://gist.github.com/" From 2af2fe3e712f203a0b114e4effbbb1f35e664ebb Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 24 Sep 2015 07:51:20 -0700 Subject: [PATCH 05/10] Add "afk" function to lock screen. --- dotfiles/zshrc.d/afk.zsh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dotfiles/zshrc.d/afk.zsh diff --git a/dotfiles/zshrc.d/afk.zsh b/dotfiles/zshrc.d/afk.zsh new file mode 100644 index 0000000..95ebbaa --- /dev/null +++ b/dotfiles/zshrc.d/afk.zsh @@ -0,0 +1,11 @@ +function afk { + # Note, may fail if multiple users are logged in with different desktop + # environments. + if pidof cinnamon-screensaver >/dev/null ; then + cinnamon-screensaver-command -l + elif pidof gnome-screensaver >/dev/null ; then + gnome-screensaver-command -l + else + echo 'No screensaver found...' >&2 + fi +} From a05dd1ee0768034eb693916dcfe123d7f7320815 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Fri, 25 Sep 2015 20:08:32 -0700 Subject: [PATCH 06/10] Add --delete-excluded to backup script. --- bin/backup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/backup.sh b/bin/backup.sh index 2e5c80a..d55657e 100755 --- a/bin/backup.sh +++ b/bin/backup.sh @@ -26,4 +26,5 @@ function verify_dest { verify_dest "$DEST" -rsync -Hax --delete-before --exclude-from="$HOME/.rsync_ignore" "${HOME}/" "$DEST" +rsync -Hax --delete-before --exclude-from="$HOME/.rsync_ignore" \ + --delete-excluded "${HOME}/" "$DEST" From d8093419531e4a7572f886ff5c2fe152047c732a Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 26 Sep 2015 06:16:01 -0700 Subject: [PATCH 07/10] Add Go appengine SDK to path. --- dotfiles/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/profile b/dotfiles/profile index 9f3c2e5..d0d6c1a 100644 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -24,7 +24,7 @@ export DEBFULLNAME="David Tomaschik" export LESS="-MR" EXTRA_PATHS=("$HOME/.gce/google-cloud-sdk/bin" "$HOME/bin/genymotion" - "$HOME/bin/genymotion/tools" ) + "$HOME/bin/genymotion/tools" "$HOME/bin/go_appengine" ) for p in "${EXTRA_PATHS[@]}" ; do if [ -d "$p" ] ; then export PATH="$PATH:$p" From f828e32917b6f7d0cd661719d09ed8244d94209b Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 26 Sep 2015 06:52:02 -0700 Subject: [PATCH 08/10] Add support for packages that require X. Checks if xserver-xorg is installed to determine whether or not to install the 'X' family of packages. --- install.sh | 3 +++ packages | 4 ++++ packages.X | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 packages.X diff --git a/install.sh b/install.sh index a9aa438..145d339 100755 --- a/install.sh +++ b/install.sh @@ -13,6 +13,8 @@ if [ ! -d $BASEDIR ] ; then exit 1 fi +HAVE_X=`dpkg-query -s xserver-xorg | grep -c 'Status.*installed'` + function prerequisites { # Prerequisites require git if ! which git > /dev/null ; then @@ -158,6 +160,7 @@ function install_apt_pkgs { ( echo "Can't run apt-get commands" >&2 && \ return 1 ) run_as_root apt-get -y install `cat ${BASEDIR}/packages` + (( $HAVE_X )) && run_as_root apt-get -y install `cat ${BASEDIR}/packages.X` } diff --git a/packages b/packages index cda71ec..0bdfcb2 100644 --- a/packages +++ b/packages @@ -11,3 +11,7 @@ curl strace ltrace traceroute +tshark +tcpdump +gnupg-curl +gdb diff --git a/packages.X b/packages.X new file mode 100644 index 0000000..c3bdb08 --- /dev/null +++ b/packages.X @@ -0,0 +1,4 @@ +fonts-inconsolata +wireshark +keepassx +vim-gtk From 24322458854c534fb1bb4d4115c570897ad37dc7 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sun, 27 Sep 2015 18:16:34 -0700 Subject: [PATCH 09/10] Add more packages. --- packages | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages b/packages index 0bdfcb2..1e25d08 100644 --- a/packages +++ b/packages @@ -15,3 +15,5 @@ tshark tcpdump gnupg-curl gdb +sqlite3 +radare2 From a2a308c7d3729807db6a23602bcfd26315d16f4d Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 28 Sep 2015 20:34:05 -0700 Subject: [PATCH 10/10] Setting TZ universally is confusing. --- dotfiles/profile | 1 - 1 file changed, 1 deletion(-) diff --git a/dotfiles/profile b/dotfiles/profile index d0d6c1a..7d66484 100644 --- a/dotfiles/profile +++ b/dotfiles/profile @@ -18,7 +18,6 @@ export PYTHONPATH="$HOME/.python" export GOPATH="$HOME/.go" export VISUAL=vim export EDITOR=vim -export TZ='America/Los_Angeles' export DEBEMAIL="david@systemoverlord.com" export DEBFULLNAME="David Tomaschik" export LESS="-MR"