maybe tmux is back

.config/tmux/tmux.conf

@@ -0,0 +1,6 @@
+bind r source-file ~/.tmux.conf \; display "Reloaded tmux config";
+
+set -g prefix C-y
+
+source-file ~/.config/tmux/tmux.conf.d/plugins.conf
+source-file ~/.config/tmux/tmux.conf.d/keybinds.conf

.config/tmux/tmux.conf.d/keybinds.conf

@@ -0,0 +1,5 @@
+bind-key w select-pane -U
+bind-key a select-pane -L
+bind-key s select-pane -D
+bind-key d select-pane -R
+bind-key c detach

.config/tmux/tmux.conf.d/plugins.conf

@@ -0,0 +1,8 @@
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'catppuccin/tmux'
+
+set -g @catppuccin_flavor "macchiato"
+set -g @catppuccin_window_status_style "rounded"
+
+#source-file '~/.config/tmux/tmux.conf.d/catppuccin.conf'
+run "~/.tmux/plugins/tpm/tpm"

.gitmodules

@@ -10,6 +10,6 @@
 [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
+[submodule ".config/tmux/plugins/tmux"]
+	path = .config/tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux

.tmux.conf

@@ -0,0 +1 @@
+source-file ~/.config/tmux/tmux.conf

setup

@@ -1,34 +1,3 @@
-<<<<<<< HEAD
-#!/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..."
-
-ln -sf "$PWD/.zshrc" "$HOME/.zshrc"
-ln -sf "$PWD/.p10k.zsh" "$HOME/.p10k.zsh"
-ln -sf "$PWD/.config" "$HOME/.config"
-ln -sf "$PWD/.alias.d" "$HOME/.alias.d"
-ln -sf "$PWD/.profile" "$HOME/.profile"
-
-if [ ! -f "$PWD/.zshenv" ]; then
-    cp "$PWD/.zshenv.template" "$PWD/.zshenv"
-fi
-
-ln -sf "$PWD/.zshenv" "$HOME/.zshenv"
-=======
 #!/usr/bin/env bash
 
 set -e
@@ -36,7 +5,7 @@ set -e
 echo "[+] Cloning submodules..."
 git submodule update --init --recursive
 
-find ./config/tmux -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix
+find ./config/tmux/plugins -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix
 
 echo "[+] Creating Gitconfigs..."
 
@@ -54,4 +23,3 @@ if [ ! -f "$PWD/.zshenv" ]; then
 fi
 
 stow .
->>>>>>> ae6c9c8 (add tmux plugins)