From 376933605c5cd571f6958d02b628d7bc0f601354 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 15 Jan 2022 17:18:38 -0500
Subject: [PATCH 1/3] probably hashicorp stuff related

---
 vimrc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/vimrc b/vimrc
index 88c7982..21bea14 100644
--- a/vimrc
+++ b/vimrc
@@ -32,14 +32,16 @@ if has("persistent_undo")
   set undofile
 endif
 
-au BufRead,BufNewFile Pipfile setfiletype toml
 au BufRead,BufNewFile *.gcfg setfiletype gitconfig
-au BufRead,BufNewFile Pipfile setfiletype toml
-au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
+au BufRead,BufNewFile *.hcl setfiletype hcl
+au BufRead,BufNewFile *.nomad setfiletype hcl
 au BufRead,BufNewFile *.service setfiletype systemd
 au BufRead,BufNewFile .Rprofile setfiletype r
-au QuickFixCmdPost *grep* cwindow
+au BufRead,BufNewFile .envrc setfiletype sh
+au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
+au BufRead,BufNewFile Pipfile setfiletype toml
 au BufWritePre *.py execute ':Black'
+au QuickFixCmdPost *grep* cwindow
 
 map ,t :w<CR>
 map ,- :nohl<CR>
@@ -50,6 +52,8 @@ let g:airline_powerline_fonts = 1
 let g:coc_global_extensions = ['coc-tsserver']
 let g:coc_node_path = "/home/dan/.nvm/versions/node/v16.9.1/bin/node"
 let g:go_fmt_command = "goimports"
+let g:html_indent_script1 = "inc"
+let g:html_indent_style1 = "inc"
 let g:python_highlight_all = 1
 let g:rustfmt_autosave = 1
 let g:shfmt_extra_args = '-i 2'

From b115edd210633fc38fcc0b78f93c0ebf49066f17 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sun, 6 Mar 2022 13:46:07 -0500
Subject: [PATCH 2/3] Leftwm and ssh session goop

---
 config/leftwm/config.toml |  5 +++++
 xinitrc                   |  2 ++
 zshrc                     | 22 ----------------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/config/leftwm/config.toml b/config/leftwm/config.toml
index ad2e83f..4496e18 100644
--- a/config/leftwm/config.toml
+++ b/config/leftwm/config.toml
@@ -43,6 +43,11 @@ value = "slock"
 modifier = ["modkey", "Control"]
 key = "l"
 
+[[keybind]]
+command = "ToggleFullScreen"
+modifier = ["modkey", "Shift"]
+key = "f"
+
 [[keybind]]
 command = "MoveToLastWorkspace"
 modifier = ["modkey", "Shift"]
diff --git a/xinitrc b/xinitrc
index 4d6491a..b3be680 100644
--- a/xinitrc
+++ b/xinitrc
@@ -16,4 +16,6 @@ function _xinit_setup_xinput() {
 
 _xinit_setup_xinput
 
+eval "$(ssh-agent)"
+
 exec leftwm
diff --git a/zshrc b/zshrc
index a62693a..4661f9e 100644
--- a/zshrc
+++ b/zshrc
@@ -169,26 +169,6 @@ done
 
 export GPG_TTY=$(tty)
 
-function dump-ssh-agent() {
-  env | awk '/SSH/ {
-      sub(/=/, "=\"", $1)
-      sub(/$/, "\"", $1)
-      print "export " $1
-  }' | tee ~/.ssh/agent.out
-}
-
-function load-ssh-agent() {
-  source ~/.ssh/agent.out
-}
-
-function start-ssh-agent() {
-  ssh-agent >~/.ssh/agent.out
-}
-
-function setup-ssh-agent() {
-  start-ssh-agent && load-ssh-agent
-}
-
 function __maybesource() {
   if [[ -f "${1}" ]]; then
     if [[ "${2}" == silent ]]; then
@@ -221,8 +201,6 @@ function docker-cleanup() {
   done
 }
 
-load-ssh-agent &>/dev/null
-
 export NVM_DIR="${HOME}/.nvm"
 
 __maybesource ~/.zshenv

From e94d0ea6f66b4084ea3ed8dceddab2ee680dbe74 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Thu, 21 Apr 2022 11:40:29 -0400
Subject: [PATCH 3/3] Making messes with xinput and minirc

---
 config/xinit_functions.sh | 31 +++++++++++++++++++++++++++++++
 minirc.dfl                |  7 +++++++
 xinitrc                   | 16 ++++------------
 3 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 config/xinit_functions.sh
 create mode 100644 minirc.dfl

diff --git a/config/xinit_functions.sh b/config/xinit_functions.sh
new file mode 100644
index 0000000..2976963
--- /dev/null
+++ b/config/xinit_functions.sh
@@ -0,0 +1,31 @@
+function _xinit_setup_xinput() {
+  if ! xinput list >/dev/null; then
+    return
+  fi
+
+  _xinit_setup_xinput_touchpad
+  _xinit_setup_xinput_trackman_marble
+}
+
+function _xinit_setup_xinput_touchpad() {
+  if ! xinput list-props 'Elan Touchpad' >/dev/null; then
+    return
+  fi
+
+  xinput set-prop 'Elan Touchpad' \
+    'libinput Natural Scrolling Enabled' 1
+}
+
+function _xinit_setup_xinput_trackman_marble() {
+  if ! xinput list-props 'Logitech USB Trackball' >/dev/null; then
+    return
+  fi
+
+  xinput set-button-map \
+    'Logitech USB Trackball' \
+    1 2 3 4 5 6 7 8 9
+  xinput set-prop \
+    'Logitech USB Trackball' \
+    'libinput Scroll Method Enabled' \
+    0, 0, 1
+}
diff --git a/minirc.dfl b/minirc.dfl
new file mode 100644
index 0000000..2c46c23
--- /dev/null
+++ b/minirc.dfl
@@ -0,0 +1,7 @@
+pu baudrate 115200
+pu bits 8
+pu parity N
+pu stopbits 1
+pu rtscts No
+pu xonxoff No
+
diff --git a/xinitrc b/xinitrc
index b3be680..184f420 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,21 +1,13 @@
 # vim:filetype=bash:expandtab:ts=2:sts=2
 setxkbmap dvorak
 
-function _xinit_setup_xinput() {
-  if ! xinput list &>/dev/null; then
-    return
-  fi
-
-  if ! xinput list-props 'Elan Touchpad' &>/dev/null; then
-    return
-  fi
-
-  xinput set-prop 'Elan Touchpad' \
-    'libinput Natural Scrolling Enabled' 1
-}
+. ~/.config/xinit_functions.sh
 
 _xinit_setup_xinput
 
 eval "$(ssh-agent)"
 
+if [ -n "${WM}" ]; then
+  exec "${WM}"
+fi
 exec leftwm