From 048b69ae130d2df3d897ff60b8e749491e246623 Mon Sep 17 00:00:00 2001
From: Constantin Simonis <constantin@simonis.lol>
Date: Sat, 14 Jun 2025 21:08:44 +0200
Subject: [PATCH] add tmux plugins

---
 .config/tmux/plugins/catppuccin-tmux |  1 +
 .config/tmux/plugins/tpm             |  1 +
 .config/tmux/tmux.conf               |  6 ++++--
 .gitmodules                          | 24 +++++++++++++++---------
 setup                                | 28 +++++++++++++++++++++++++++-
 5 files changed, 48 insertions(+), 12 deletions(-)
 create mode 160000 .config/tmux/plugins/catppuccin-tmux
 create mode 160000 .config/tmux/plugins/tpm

diff --git a/.config/tmux/plugins/catppuccin-tmux b/.config/tmux/plugins/catppuccin-tmux
new file mode 160000
index 0000000..14a546f
--- /dev/null
+++ b/.config/tmux/plugins/catppuccin-tmux
@@ -0,0 +1 @@
+Subproject commit 14a546fb64dc1141e5d02bac2185d8c1fd530d6a
diff --git a/.config/tmux/plugins/tpm b/.config/tmux/plugins/tpm
new file mode 160000
index 0000000..99469c4
--- /dev/null
+++ b/.config/tmux/plugins/tpm
@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 873214e..13ae33d 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -10,6 +10,8 @@ bind-key a select-pane -L
 bind-key s select-pane -D
 bind-key d select-pane -R
 
-set -g @plugin 'git@github.com/tmux-plugins/tpm'
+set -g @plugin '~/.config/tmux/plugins/tpm'
+#set -g @plugin '~/.config/tmux/plugins/catppuccin-tmux'
 
-run '~/.tmux/plugins/tpm/tpm'
+run '~/.config/tmux/plugins/tpm'
+#run '~/.config/tmux/plugins/catppuccin-tmux/catppuccin.tmux'
diff --git a/.gitmodules b/.gitmodules
index 3b8526e..55e0fe9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,15 @@
-[submodule "zsh/plugins/zsh-autosuggestions"]
-	path = zsh/plugins/zsh-autosuggestions
-	url = https://github.com/zsh-users/zsh-autosuggestions
-[submodule "zsh/plugins/zsh-syntax-highlighting"]
-	path = zsh/plugins/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting
-[submodule "zsh/themes/powerlevel10k"]
-	path = zsh/themes/powerlevel10k
-	url = https://github.com/romkatv/powerlevel10k
+[submodule "zsh/plugins/zsh-autosuggestions"]
+	path = zsh/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
+[submodule "zsh/plugins/zsh-syntax-highlighting"]
+	path = zsh/plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting
+[submodule "zsh/themes/powerlevel10k"]
+	path = zsh/themes/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k
+[submodule ".config/tmux/plugins/tpm"]
+	path = .config/tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm
+[submodule ".config/tmux/plugins/catppuccin-tmux"]
+	path = .config/tmux/plugins/catppuccin-tmux
+	url = https://github.com/catppuccin/tmux
diff --git a/setup b/setup
index 25cb6db..3fc38dd 100755
--- a/setup
+++ b/setup
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/usr/bin/env bash
 
 set -e
@@ -26,4 +27,29 @@ if [ ! -f "$PWD/.zshenv" ]; then
     cp "$PWD/.zshenv.template" "$PWD/.zshenv"
 fi
 
-ln -sf "$PWD/.zshenv" "$HOME/.zshenv"
\ No newline at end of file
+ln -sf "$PWD/.zshenv" "$HOME/.zshenv"
+=======
+#!/usr/bin/env bash
+
+set -e
+
+echo "[+] Cloning submodules..."
+git submodule update --init --recursive
+
+echo "[+] Creating Gitconfigs..."
+
+(
+    for config in $PWD/.gitconfig.d/*.gitconfig; do
+        echo "[include]"
+        echo "    path = $config"
+    done;
+) > "$HOME/.gitconfig"
+
+echo "[+] Creating symlinks..."
+
+if [ ! -f "$PWD/.zshenv" ]; then
+    cp "$PWD/.zshenv.template" "$PWD/.zshenv"
+fi
+
+stow .
+>>>>>>> ae6c9c8 (add tmux plugins)