From 9077461ea8f8751e1adcb48bc98e6b36e7c41e3c Mon Sep 17 00:00:00 2001
From: Ben Kreeger <ben@kree.gr>
Date: Thu, 17 Jul 2025 12:57:39 -0500
Subject: [PATCH] Add a few fixes for devcontainers and linux

---
 gnupg/sshcontrol       |  4 ++++
 nvim/ftplugin/bash.lua |  2 ++
 nvim/ftplugin/sh.lua   |  2 ++
 setup.sh               |  2 +-
 zsh/functions.zsh      | 11 +++++++----
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 nvim/ftplugin/bash.lua
 create mode 100644 nvim/ftplugin/sh.lua

diff --git a/gnupg/sshcontrol b/gnupg/sshcontrol
index d8b9981..b0239e8 100644
--- a/gnupg/sshcontrol
+++ b/gnupg/sshcontrol
@@ -13,3 +13,7 @@
 # Fingerprints:  MD5:fa:dd:77:ed:5b:b8:4b:f5:86:c9:28:fe:75:4d:33:4c
 #                SHA256:IySx4YGOxmVOMHnJqNvLdy+vuaBE4KqR1zlapSyFbA0
 61B8FC9F096AE88D04C2EBA74AF0325D80E0C4D2 0
+# Ed25519 key added on: 2025-07-09 15:49:46
+# Fingerprints:  MD5:31:9c:2e:d7:59:0f:e8:95:02:0d:1a:ac:ca:22:1d:a9
+#                SHA256:LvwWwJk//kItoCjyyJz7BH1M9Op1YhoNGUn7BqmlhjM
+2324982E438AC579625F77B541528FCBCE05B6B6 0
diff --git a/nvim/ftplugin/bash.lua b/nvim/ftplugin/bash.lua
new file mode 100644
index 0000000..5fe9e43
--- /dev/null
+++ b/nvim/ftplugin/bash.lua
@@ -0,0 +1,2 @@
+vim.bo.shiftwidth = 2
+vim.bo.expandtab = true
diff --git a/nvim/ftplugin/sh.lua b/nvim/ftplugin/sh.lua
new file mode 100644
index 0000000..5fe9e43
--- /dev/null
+++ b/nvim/ftplugin/sh.lua
@@ -0,0 +1,2 @@
+vim.bo.shiftwidth = 2
+vim.bo.expandtab = true
diff --git a/setup.sh b/setup.sh
index ab3f75d..9205b04 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,6 +18,6 @@ done
 
 zshfiles=("zshenv" "zprofile" "zshrc")
 for file in "${zshfiles[@]}"; do
-    if [[ -a "$HOME/.$file" ]]; then continue; fi
+    if [[ -a "$HOME/.$file" && $* != *--force* ]]; then continue; fi
     ln -sfv "$SCRIPTPATH/zsh/$file" "$HOME/.$file"
 done
diff --git a/zsh/functions.zsh b/zsh/functions.zsh
index ad9a7fb..17ead13 100644
--- a/zsh/functions.zsh
+++ b/zsh/functions.zsh
@@ -56,14 +56,17 @@ function random_string() {
 }
 
 # devcontainer aliases
-function devcup() {
+function devconbuild() {
+    devcontainer build --workspace-folder .
+}
+function devconup() {
     devcontainer up --workspace-folder .
 }
-function devcexec() {
+function devconexec() {
     devcontainer exec --workspace-folder . $1
 }
-function devcshell() {
-    devcexec /usr/bin/zsh
+function devconshell() {
+    devconexec /usr/bin/zsh
 }
 
 # Dotfile update command(s)