From 9e713143dc017f631bd1a0b16e91c0a85b5d4a67 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 19 Dec 2024 09:32:26 -0500
Subject: [PATCH 1/6] Trying to add leap to vim

---
 .gitmodules                              | 3 +++
 configs/vim/pack/ggandor/start/leap.nvim | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 configs/vim/pack/ggandor/start/leap.nvim

diff --git a/.gitmodules b/.gitmodules
index d6e33fc..ec25f4a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,3 +33,6 @@
 [submodule "configs/nvim/pack/neovim/start/nvim-lspconfig"]
 	path = configs/nvim/pack/neovim/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
+[submodule "configs/vim/pack/ggandor/start/leap.nvim"]
+	path = configs/vim/pack/ggandor/start/leap.nvim
+	url = https://github.com/ggandor/leap.nvim
diff --git a/configs/vim/pack/ggandor/start/leap.nvim b/configs/vim/pack/ggandor/start/leap.nvim
new file mode 160000
index 0000000..c6bfb19
--- /dev/null
+++ b/configs/vim/pack/ggandor/start/leap.nvim
@@ -0,0 +1 @@
+Subproject commit c6bfb191f1161fbabace1f36f578a20ac6c7642c

From 5295e62f559d3b07c8e47372c2f2d24df9d71c82 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 19 Dec 2024 09:32:38 -0500
Subject: [PATCH 2/6] wip

---
 configs/proxmark3/preferences.json | 24 ++++++++++++++++++++++++
 configs/vim/.vimrc                 |  4 ++++
 install-linux.sh                   | 10 +++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 configs/proxmark3/preferences.json

diff --git a/configs/proxmark3/preferences.json b/configs/proxmark3/preferences.json
new file mode 100644
index 0000000..0abd8e2
--- /dev/null
+++ b/configs/proxmark3/preferences.json
@@ -0,0 +1,24 @@
+{
+  "Created": "proxmark3",
+  "FileType": "settings",
+  "show.emoji": "emoji",
+  "show.hints": true,
+  "output.dense": false,
+  "os.supports.colors": true,
+  "file.default.savepath": "/Users/ewpratten/Documents/proxmark",
+  "file.default.dumppath": "/Users/ewpratten/Documents/proxmark",
+  "file.default.tracepath": "/Users/ewpratten/Documents/proxmark",
+  "window.plot.xpos": 10,
+  "window.plot.ypos": 30,
+  "window.plot.hsize": 400,
+  "window.plot.wsize": 800,
+  "window.overlay.xpos": 10,
+  "window.overlay.ypos": 490,
+  "window.overlay.hsize": 200,
+  "window.overlay.wsize": 800,
+  "window.overlay.sliders": true,
+  "client.debug.level": "off",
+  "show.bar.mode": "value",
+  "client.exe.delay": 0,
+  "client.timeout": 0
+}
\ No newline at end of file
diff --git a/configs/vim/.vimrc b/configs/vim/.vimrc
index 3748efa..beecc8e 100644
--- a/configs/vim/.vimrc
+++ b/configs/vim/.vimrc
@@ -79,6 +79,10 @@ if !exists('g:vscode')
     autocmd FileType usda setlocal nospell
 endif
 
+
+" Enable Leap
+lua require('leap').add_default_mappings()
+
 " Configure Diff rendering
 hi DiffText         ctermfg=White       ctermbg=none
 hi DiffFile         ctermfg=White       ctermbg=none cterm=bold
diff --git a/install-linux.sh b/install-linux.sh
index 02b75ce..ff0a918 100644
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -38,6 +38,8 @@ mkdir -p ~/.config/gqrx
 mkdir -p ~/.config/pip
 mkdir -p ~/.cargo
 mkdir -p ~/.ssh
+mkdir -p ~/.proxmark3
+mkdir -p ~/.vim
 
 # Mac-specific dirs
 if [ "$(uname)" == "Darwin" ]; then
@@ -67,8 +69,11 @@ touch ~/.ssh/config.local
 chmod 644 "$HOME/.ssh/config"
 if type -p chown > /dev/null; then chown $(id -u) "$HOME/.ssh/config"; fi 
 
-# Configure (neo)Vim
+# Configure vim
 ln -sf $EWCONFIG_ROOT/configs/vim/.vimrc ~/.vimrc
+ln -snf $EWCONFIG_ROOT/configs/vim/pack ~/.vim/pack
+
+# Configure neovim
 ln -sf $EWCONFIG_ROOT/configs/nvim/init.vim ~/.config/nvim/init.vim
 ln -snf $EWCONFIG_ROOT/configs/nvim/pack ~/.config/nvim/pack
 ln -snf $EWCONFIG_ROOT/configs/nvim/third_party ~/.config/nvim/third_party
@@ -91,6 +96,9 @@ ln -sf $EWCONFIG_ROOT/configs/cargo/config.toml ~/.cargo/config.toml
 # Termux
 ln -sf $EWCONFIG_ROOT/configs/termux/termux.properties ~/.config/termux/termux.properties
 
+# Proxmark3
+ln -sf $EWCONFIG_ROOT/configs/proxmark3/preferences.json ~/.proxmark3/preferences.json
+
 # Set up user-tempfiles configs
 ln -sf $EWCONFIG_ROOT/configs/user-tmpfiles.d/* ~/.config/user-tmpfiles.d/
 

From a53b07703e0ea103f3a8ea576787b003a03084e1 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 19 Dec 2024 09:33:08 -0500
Subject: [PATCH 3/6] rm leap

---
 .gitmodules                              | 3 ---
 configs/vim/.vimrc                       | 3 ---
 configs/vim/pack/ggandor/start/leap.nvim | 1 -
 3 files changed, 7 deletions(-)
 delete mode 160000 configs/vim/pack/ggandor/start/leap.nvim

diff --git a/.gitmodules b/.gitmodules
index ec25f4a..d6e33fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,6 +33,3 @@
 [submodule "configs/nvim/pack/neovim/start/nvim-lspconfig"]
 	path = configs/nvim/pack/neovim/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
-[submodule "configs/vim/pack/ggandor/start/leap.nvim"]
-	path = configs/vim/pack/ggandor/start/leap.nvim
-	url = https://github.com/ggandor/leap.nvim
diff --git a/configs/vim/.vimrc b/configs/vim/.vimrc
index beecc8e..3cce83e 100644
--- a/configs/vim/.vimrc
+++ b/configs/vim/.vimrc
@@ -80,9 +80,6 @@ if !exists('g:vscode')
 endif
 
 
-" Enable Leap
-lua require('leap').add_default_mappings()
-
 " Configure Diff rendering
 hi DiffText         ctermfg=White       ctermbg=none
 hi DiffFile         ctermfg=White       ctermbg=none cterm=bold
diff --git a/configs/vim/pack/ggandor/start/leap.nvim b/configs/vim/pack/ggandor/start/leap.nvim
deleted file mode 160000
index c6bfb19..0000000
--- a/configs/vim/pack/ggandor/start/leap.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6bfb191f1161fbabace1f36f578a20ac6c7642c

From 0cc21364ca5e9ce44bb838acace4dcbc491f5d52 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 19 Dec 2024 14:41:07 -0500
Subject: [PATCH 4/6] fix missing dir

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

diff --git a/install-linux.sh b/install-linux.sh
index ff0a918..b511c41 100644
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -70,6 +70,7 @@ chmod 644 "$HOME/.ssh/config"
 if type -p chown > /dev/null; then chown $(id -u) "$HOME/.ssh/config"; fi 
 
 # Configure vim
+mkdir -p $EWCONFIG_ROOT/configs/vim/pack
 ln -sf $EWCONFIG_ROOT/configs/vim/.vimrc ~/.vimrc
 ln -snf $EWCONFIG_ROOT/configs/vim/pack ~/.vim/pack
 

From 8d70a8ed89d71ef24c6329ccc098e31e92222d52 Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Thu, 19 Dec 2024 22:29:45 -0500
Subject: [PATCH 5/6] Basic age stuff

---
 scripts/age-open | 18 ++++++++++++++++++
 scripts/dlcrypt  | 10 ++++++++++
 2 files changed, 28 insertions(+)
 create mode 100755 scripts/age-open
 create mode 100755 scripts/dlcrypt

diff --git a/scripts/age-open b/scripts/age-open
new file mode 100755
index 0000000..8c2150e
--- /dev/null
+++ b/scripts/age-open
@@ -0,0 +1,18 @@
+#! /bin/bash
+set -e
+
+# Require an AGE-encrypted file
+if [ $# != 1 ]; then
+    echo "Usage: $(basename $0) <file>"
+    exit 1
+fi
+
+# Decrypt the file to temp
+age -d "$1" > /tmp/$(echo "$1" | sed 's/\.age$//')
+
+# Open the decrypted file
+open /tmp/$(echo "$1" | sed 's/\.age$//') &
+
+# Remove the decrypted file
+sleep 10
+rm /tmp/$(echo "$1" | sed 's/\.age$//')
\ No newline at end of file
diff --git a/scripts/dlcrypt b/scripts/dlcrypt
new file mode 100755
index 0000000..48d0e8a
--- /dev/null
+++ b/scripts/dlcrypt
@@ -0,0 +1,10 @@
+#! /bin/bash
+set -e
+
+# Require an output path and a URL
+if [ $# != 2 ]; then
+    echo "Usage: $(basename $0) <output> <url>"
+    exit 1
+fi
+
+age -p <(curl -sSL "$2") > "$1"
\ No newline at end of file

From 50a23cf3b7bf469f9e82823c19a679a567ea5aed Mon Sep 17 00:00:00 2001
From: Evan Pratten <evan@ewpratten.com>
Date: Sun, 22 Dec 2024 12:05:58 -0500
Subject: [PATCH 6/6] fix keys alias

---
 configs/.zshrc         | 2 +-
 scripts/get-mac-serial | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100755 scripts/get-mac-serial

diff --git a/configs/.zshrc b/configs/.zshrc
index 061d2d0..6833fac 100644
--- a/configs/.zshrc
+++ b/configs/.zshrc
@@ -111,9 +111,9 @@ alias snvim="sudoedit"
 alias genuuid="python -c 'import uuid; print(uuid.uuid4())'"
 alias nvim-tmp="$EDITOR $(mktemp)"
 alias vim-tmp="$EDITOR $(mktemp)"
+alias wg-easykeys="wg genkey | tee >(wg pubkey)"
 
 # Some aliases only make sense if their parent command exists
-[[ -x "$(command -v wg)" ]] && alias wg-easykeys="wg genkey | tee >(wg pubkey)"
 [[ -x "$(command -v systemd-resolve)" ]] && alias flush-dns="sudo systemd-resolve --flush-caches"
 [[ -x "$(command -v ykman)" ]] && alias yk-totp="ykman oath accounts code"
 [[ -x "$(command -v ufw)" ]] && alias ufw-status="sudo ufw status numbered"
diff --git a/scripts/get-mac-serial b/scripts/get-mac-serial
new file mode 100755
index 0000000..d7833d0
--- /dev/null
+++ b/scripts/get-mac-serial
@@ -0,0 +1,4 @@
+#! /bin/bash
+set -e
+
+ioreg -l | grep IOPlatformSerialNumber | grep -oE '"([^"]+)"$' | tr -d '"'