From 309c3582590eac875d52bc5883c6013b4da26aad Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Sat, 9 Nov 2024 23:12:01 -0500
Subject: [PATCH] Auto commit: 2024-11-09 23:12:01

---
 .config/tmux/tmux.conf | 7 ++++---
 .config/yadm/auto.sh   | 3 ++-
 .config/yadm/config    | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .config/yadm/config

diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 1f2c9155..b0ab9406 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -49,11 +49,12 @@ bind S command-prompt -p "rename session:" "rename-session '%%'"
 # bind W command-prompt -p "rename window:" "rename-window '%%'"
 bind - copy-mode
 # bind m next-layout
-
+bind -n M-i next-window
+bind -n M-m previous-window
 
 # Joining and sending
-bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
-bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
+# bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
+# bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
 # bind -n S-Left previous-window
 # bind -n S-Right next-window
 
diff --git a/.config/yadm/auto.sh b/.config/yadm/auto.sh
index 29add76c..827fdf52 100755
--- a/.config/yadm/auto.sh
+++ b/.config/yadm/auto.sh
@@ -21,7 +21,8 @@ if [[ -n $(yadm status --porcelain) ]]; then
   yadm commit -m "Auto commit: $(date +'%Y-%m-%d %H:%M:%S')"
   # Check if the ssh-agent env is present
   if [ -f ~/.ssh/environment-dpad ]; then
-    source "$HOME/.ssh/environment-dpad"
+    # source "$HOME/.ssh/environment-dpad"
+    source "$HOME/.ssh/environment-$(cat /etc/hostname)"
     yadm push
   else
     echo "ERROR: ssh-agent environment not found, aborting push..."
diff --git a/.config/yadm/config b/.config/yadm/config
new file mode 100644
index 00000000..ca0288c7
--- /dev/null
+++ b/.config/yadm/config
@@ -0,0 +1,2 @@
+[pull]
+	rebase = false