From 590a1a2fa0cd66294396447109b824eba3aef165 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 23 Apr 2018 22:12:05 -0700
Subject: [PATCH 1/7] Script to setup APT proxy.

---
 bin/_install_apt_proxy.sh | 34 ++++++++++++++++++++++++++++++++++
 dotfiles/Xresources       |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 bin/_install_apt_proxy.sh

diff --git a/bin/_install_apt_proxy.sh b/bin/_install_apt_proxy.sh
new file mode 100755
index 0000000..afa3f13
--- /dev/null
+++ b/bin/_install_apt_proxy.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+
+if test -f /etc/apt/apt.conf.d/90-proxy ; then
+  echo "Looks already setup."
+fi
+
+cat >/etc/apt/proxy-detect <<'EOF'
+#!/bin/bash
+
+PROXY=192.168.60.10:3142
+
+if ! test -x /bin/nc ; then
+  echo DIRECT
+  exit 0
+fi
+
+if nc -w 2 -z ${PROXY/:/ } ; then
+  echo ${PROXY}
+  exit 0
+fi
+
+echo DIRECT
+EOF
+
+chmod +x /etc/apt/proxy-detect
+
+cat >/etc/apt/apt.conf.d/90-proxy <<'EOF'
+Acquire::http::Proxy-Auto-Detect "/etc/apt/proxy-detect";
+EOF
+
+echo "Setup APT Proxying."
diff --git a/dotfiles/Xresources b/dotfiles/Xresources
index 04c1e8b..a324518 100644
--- a/dotfiles/Xresources
+++ b/dotfiles/Xresources
@@ -3,7 +3,7 @@ Xcursor.size: 16
 !!!
 ! Xft for fonts
 !!!
-Xft.dpi:                    96
+!Xft.dpi:                    144
 Xft.antialias:              false
 Xft.lcdfilter:              lcddefault
 Xft.rgba:                   rgb

From 48477290f0138af08710cf1d9a4f9225970736a7 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 2 May 2018 14:43:34 -0700
Subject: [PATCH 2/7] Fix zshrc compinstall path

---
 dotfiles/zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index eb8f631..0eb3c1f 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -7,7 +7,7 @@ unsetopt beep histbeep listbeep flowcontrol
 bindkey -e
 
 # Completion
-zstyle :compinstall filename '/home/david/.zshrc'
+zstyle :compinstall filename "${HOME}/.zshrc"
 autoload -Uz compinit && compinit
 
 DIRSTACKSIZE=16

From 5e3d133f8bbd1729f2788cb6f7c270365da12f32 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 2 May 2018 22:13:42 -0700
Subject: [PATCH 3/7] Switch to vim keybindings.

---
 dotfiles/zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 0eb3c1f..ac803ba 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -4,7 +4,7 @@ HISTSIZE=10000
 SAVEHIST=10000
 setopt appendhistory autocd autopushd extendedglob nohup nomatch histignorespace histlexwords histverify cbases
 unsetopt beep histbeep listbeep flowcontrol
-bindkey -e
+bindkey -v
 
 # Completion
 zstyle :compinstall filename "${HOME}/.zshrc"

From 01432d1f417ac2e4088293043d16f66c6b4d9132 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 12 May 2018 15:57:17 -0700
Subject: [PATCH 4/7] Roll back removing titles for groupings.

---
 dotfiles/zshrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index eb8f631..4b1b17f 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -36,9 +36,6 @@ fi
 # Overrides to prezto
 unsetopt cdablevars
 
-# No groupings of completions
- zstyle ':completion:*' format ''
-
 # .profile is universal
 # but after zprezto to use/override anything setup there
 . ~/.profile

From b1bea45a48cbe7e51f64a4d831344d5a3182871d Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 7 May 2018 22:25:17 -0700
Subject: [PATCH 5/7] Update skel to handle minimal environments.

---
 dotfiles/env                                  | 46 ++++++++++++-------
 .../matir/functions/prompt_matir_setup        |  4 +-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/dotfiles/env b/dotfiles/env
index bb443f1..f914dff 100755
--- a/dotfiles/env
+++ b/dotfiles/env
@@ -27,22 +27,36 @@ export VIRTUALENVWRAPPER_VIRTUALENV_ARGS='--no-site-packages'
 export GPG_ID=7FD58D9A196DCEEEAD671F94F4D7A7915DEA789B
 
 # Setup locale
-for l in en_US.UTF-8 C ; do
-  if grep -q "${l}" /usr/share/i18n/SUPPORTED ; then
-    export LC_CTYPE=${l}
-    export LC_NUMERIC=${l}
-    export LC_TIME=${l}
-    export LC_MONETARY=${l}
-    export LC_MESSAGES=${l}
-    export LC_PAPER=${l}
-    export LC_NAME=${l}
-    export LC_ADDRESS=${l}
-    export LC_TELEPHONE=${l}
-    export LC_MEASUREMENT=${l}
-    export LC_IDENTIFICATION=${l}
-    break
-  fi
-done
+if test -f /usr/share/i18n/SUPPORTED ; then
+  for l in en_US.UTF-8 C ; do
+    if grep -q "${l}" /usr/share/i18n/SUPPORTED ; then
+      export LC_CTYPE=${l}
+      export LC_NUMERIC=${l}
+      export LC_TIME=${l}
+      export LC_MONETARY=${l}
+      export LC_MESSAGES=${l}
+      export LC_PAPER=${l}
+      export LC_NAME=${l}
+      export LC_ADDRESS=${l}
+      export LC_TELEPHONE=${l}
+      export LC_MEASUREMENT=${l}
+      export LC_IDENTIFICATION=${l}
+      break
+    fi
+  done
+else
+  export LC_CTYPE=C
+  export LC_NUMERIC=C
+  export LC_TIME=C
+  export LC_MONETARY=C
+  export LC_MESSAGES=C
+  export LC_PAPER=C
+  export LC_NAME=C
+  export LC_ADDRESS=C
+  export LC_TELEPHONE=C
+  export LC_MEASUREMENT=C
+  export LC_IDENTIFICATION=C
+fi
 export LC_COLLATE=C
 
 if [[ -e $HOME/.localenv ]] ; then source $HOME/.localenv ; fi
diff --git a/dotfiles/zprezto_custom/matir/functions/prompt_matir_setup b/dotfiles/zprezto_custom/matir/functions/prompt_matir_setup
index de89e78..4adec18 100644
--- a/dotfiles/zprezto_custom/matir/functions/prompt_matir_setup
+++ b/dotfiles/zprezto_custom/matir/functions/prompt_matir_setup
@@ -51,7 +51,9 @@ function prompt_matir_setup {
 
 function prompt_matir_precmd {
   vcs_info
-  python-info
+  if (( $+functions[python-info] )); then
+    python-info
+  fi
 }
 
 ### git: Show marker (*) if there are untracked files in repository

From 7a7340ef1d35c343cae0e22d5ba64871739276ba Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 12 May 2018 12:45:25 -0700
Subject: [PATCH 6/7] Add chromebook key.

---
 keys/ssh/id_ecdsa_chromebook.pub | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 keys/ssh/id_ecdsa_chromebook.pub

diff --git a/keys/ssh/id_ecdsa_chromebook.pub b/keys/ssh/id_ecdsa_chromebook.pub
new file mode 100644
index 0000000..1014780
--- /dev/null
+++ b/keys/ssh/id_ecdsa_chromebook.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIsFYLEsalNh/l6PtMZhi0f/eZ22uoMw/xYpgPy6vBU6OlpN2FjW7R0pwX29fZjjVQoF0eEG0K/9/CcYcnxtspw= chronos@localhost

From ffb5d753cd5b785b488a6749986143d84ff1b7ab Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 12 May 2018 12:50:16 -0700
Subject: [PATCH 7/7] Always try sudo if needed.

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 0f0b826..d1ef817 100755
--- a/install.sh
+++ b/install.sh
@@ -221,7 +221,7 @@ run_as_root() {
   if [ ${USER} = "root" ] ; then
     "$@"
     return $?
-  elif groups | grep -q '\bsudo\b' ; then
+  elif test -x $(which sudo 2>/dev/null) ; then
     verbose "Using sudo to run ${1}..."
     sudo "$@"
     return $?