From 31ff51930c76237f3a686cbaa83848f3aebf31c2 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Thu, 12 Apr 2018 16:27:33 -0700
Subject: Add changes from desktop

---
 base/gnupg/gpg.conf                   | 6 ++++--
 base/vimrc                            | 1 +
 base/xsession                         | 7 ++++---
 host-overrides/jesterpm.net/gitconfig | 5 +++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/base/gnupg/gpg.conf b/base/gnupg/gpg.conf
index 757c9c3..cb74048 100644
--- a/base/gnupg/gpg.conf
+++ b/base/gnupg/gpg.conf
@@ -1,8 +1,10 @@
-keyserver hkp://subkeys.pgp.net
-keyserver hkp://pgp.mit.edu
+default-key 08311F3C
+
+keyserver hkps.pool.sks-keyservers.net
 keyserver-options auto-key-retrieve
 
 personal-digest-preferences SHA256
 cert-digest-algo SHA256
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
 
+use-agent
diff --git a/base/vimrc b/base/vimrc
index bad175b..8897bff 100644
--- a/base/vimrc
+++ b/base/vimrc
@@ -30,6 +30,7 @@ set sessionoptions+=resize,winpos
 set listchars=tab:>-,trail:.
 set list
 set colorcolumn=100,+0
+set guifont=Inconsolata\ Medium\ 12
 
 " Status Line Settings
 set laststatus=2          " always have status bar
diff --git a/base/xsession b/base/xsession
index 88f81e9..896303f 100644
--- a/base/xsession
+++ b/base/xsession
@@ -16,6 +16,7 @@ fi
 # Some X Stuff
 xsetroot -solid "#111"
 ulimit -c unlimited
+setxkbmap -option compose:menu
 
 # Startup applications
 #/usr/lib/deja-dup/deja-dup/deja-dup-monitor &
@@ -34,12 +35,12 @@ xrdb -merge $HOME/.Xresources
 xset -b
 
 # Host Specific Settings
-if [ -f $HOME/.host-specific/xsession ]; then
-    source $HOME/.host-specific/xsession
+if [ -f ~/.host-specific/xsession ]; then
+    source ~/.host-specific/xsession
 fi
 
 # Start terminal daemon
-urxvtd -f -o
+urxvtd -q -f -o
 
 # Make the i3 config
 
diff --git a/host-overrides/jesterpm.net/gitconfig b/host-overrides/jesterpm.net/gitconfig
index b3fca0b..866ab13 100644
--- a/host-overrides/jesterpm.net/gitconfig
+++ b/host-overrides/jesterpm.net/gitconfig
@@ -1,7 +1,12 @@
 [user]
 	name = Jesse Morgan
 	email = jesse@jesterpm.net
+	signkey = 08311F3C
 [color]
 	ui = true
 [alias]
 	lg = log --decorate --graph
+[push]
+	default = simple
+[commit]
+	gpgsign = true
-- 
cgit v1.2.3