From fc621bb31af283e3f4cbc04434d11c1c34a120b8 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sat, 29 Jun 2019 10:20:53 -0700
Subject: [PATCH 1/3] Changes to Keyserver configuration.

See https://gist.github.com/rjhansen/67ab921ffb4084c865b3618d6955275f
for rationale.
---
 dotfiles/gnupg/dirmngr.conf | 3 +--
 dotfiles/gnupg/gpg.conf     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dotfiles/gnupg/dirmngr.conf b/dotfiles/gnupg/dirmngr.conf
index 4d7d735..1411414 100644
--- a/dotfiles/gnupg/dirmngr.conf
+++ b/dotfiles/gnupg/dirmngr.conf
@@ -1,2 +1 @@
-keyserver hkps://hkps.pool.sks-keyservers.net
-hkp-cacert ~/.gnupg/sks-keyservers.pem
+keyserver hkps://keys.openpgp.org
diff --git a/dotfiles/gnupg/gpg.conf b/dotfiles/gnupg/gpg.conf
index 653d61c..e2e267d 100644
--- a/dotfiles/gnupg/gpg.conf
+++ b/dotfiles/gnupg/gpg.conf
@@ -1,6 +1,6 @@
 use-agent
 # HKPS requires gnupg-curl for gpg1
-keyserver hkps://hkps.pool.sks-keyservers.net
+keyserver hkps://keys.openpgp.org
 keyserver-options auto-key-retrieve no-honor-keyserver-url
 auto-key-locate keyserver
 personal-digest-preferences SHA256

From 5913bbb4c70c4df41278f302c5c18b0c97029d8e Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Wed, 10 Jul 2019 19:46:42 -0700
Subject: [PATCH 2/3] Add some package renames.

---
 packages.cli     | 2 +-
 packages.minimal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages.cli b/packages.cli
index 4479985..4768b67 100644
--- a/packages.cli
+++ b/packages.cli
@@ -27,10 +27,10 @@ python-hachoir-urwid
 python-html5lib
 python-nwdiag
 python-pip
-python-scapy
 python-virtualenv
 python-yara
 python3
+python3-scapy
 python3-pip
 python3-virtualenv
 radare2
diff --git a/packages.minimal b/packages.minimal
index b981513..a72b452 100644
--- a/packages.minimal
+++ b/packages.minimal
@@ -1,4 +1,4 @@
-ack-grep
+ack
 curl
 dnsutils
 gdb

From b40cbc1811998a8a6c80bf519b3e3df19b678ce2 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Fri, 12 Jul 2019 18:51:42 -0700
Subject: [PATCH 3/3] Add scar key.

---
 keys/ssh/id_ed25519_scar.pub         | 1 +
 keys/ssh/trusted/id_ed25519_scar.pub | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 keys/ssh/id_ed25519_scar.pub
 create mode 120000 keys/ssh/trusted/id_ed25519_scar.pub

diff --git a/keys/ssh/id_ed25519_scar.pub b/keys/ssh/id_ed25519_scar.pub
new file mode 100644
index 0000000..7e56a29
--- /dev/null
+++ b/keys/ssh/id_ed25519_scar.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBeDzE5KLJh2a9p0u702H9+rvaB1HoLLBU1I2Lx6NUbC david@scar
diff --git a/keys/ssh/trusted/id_ed25519_scar.pub b/keys/ssh/trusted/id_ed25519_scar.pub
new file mode 120000
index 0000000..d4a417a
--- /dev/null
+++ b/keys/ssh/trusted/id_ed25519_scar.pub
@@ -0,0 +1 @@
+../id_ed25519_scar.pub
\ No newline at end of file