even more tmux

.config/.gitignore

@@ -4,4 +4,5 @@
 !btop/
 btop/btop.log
 !neofetch/
-!ssh/
+!ssh/
+!tmux/

.config/tmux/tmux.conf

@@ -0,0 +1,8 @@
+unbind r
+bind r source-file ~/.tmux.conf
+
+set -g prefix C-y
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.tmux/plugins/'
+
+source-file ~/.config/tmux/tmux.conf.d/plugins.conf
+source-file ~/.config/tmux/tmux.conf.d/keybinds.conf

.config/tmux/tmux.conf.d/catppuccin.conf

@@ -0,0 +1,2 @@
+set -g @catppuccin_flavor "mocha"
+set -g @catppuccin_window_status_style "rounded"

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

@@ -0,0 +1,6 @@
+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,9 @@
+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"

.gitconfig.d/.gitignore

@@ -1,3 +1,3 @@
-/*
-!.gitignore
+/*
+!.gitignore
 !example.gitconfig

.gitconfig.d/example.gitconfig

@@ -1,14 +1,14 @@
-[user]
-	email = user@mail
-	name = John Doe
-	signingkey = 1234
-[credential]
-	helper = store
-[push]
-	autoSetupRemote = true
-[core]
-	autocrlf = true
-[pull]
-	rebase = true
-[commit]
-	gpgsign = true
+[user]
+	email = user@mail
+	name = John Doe
+	signingkey = 1234
+[credential]
+	helper = store
+[push]
+	autoSetupRemote = true
+[core]
+	autocrlf = true
+[pull]
+	rebase = true
+[commit]
+	gpgsign = true

.gitignore

@@ -1,15 +1 @@
-/*
-
-!setup
-!zsh/
-!.gitignore
-!.alias.d/
-!.config/
-!.gitconfig
-!.gitconfig.d
-!.p10k.zsh
-!.zshrc
-!.zshenv.template
-!.profile
-!install
-!README.md
+.zshenv

.gitmodules

@@ -7,3 +7,9 @@
 [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

.stow-local-ignore

@@ -0,0 +1,7 @@
+.git
+install 
+setup
+.gitignore
+.gitmodules
+.zshenv.template
+README.md

.tmux.conf

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

install

@@ -16,7 +16,10 @@ sudo apt install -yqq \
     exa \
     direnv \
     bat \
-    btop
+    btop \
+    stow \
+    tmux \
+    dos2unix 
 
 echo
 echo "[+] Installing Oh My Zsh..."

setup

@@ -1,3 +1,34 @@
+<<<<<<< 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
@@ -5,6 +36,8 @@ 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
+
 echo "[+] Creating Gitconfigs..."
 
 (
@@ -16,14 +49,9 @@ echo "[+] Creating Gitconfigs..."
 
 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"
+stow .
+>>>>>>> ae6c9c8 (add tmux plugins)