From 62d9cc825c50a167d1c0fcd1dbb5541dcf87c5ea Mon Sep 17 00:00:00 2001
From: thek4n <thek4n@yandex.ru>
Date: Thu, 25 Apr 2024 11:46:14 +0300
Subject: [PATCH] feat(tmux): mappings

---
 home/user/.config/tmux/aliases.conf  | 5 +++--
 home/user/.config/tmux/mappings.conf | 5 +++--
 home/user/.config/tmux/tmux.conf     | 4 ++--
 home/user/.config/zsh/sourcer        | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/home/user/.config/tmux/aliases.conf b/home/user/.config/tmux/aliases.conf
index 1e2bc1c..28cd991 100644
--- a/home/user/.config/tmux/aliases.conf
+++ b/home/user/.config/tmux/aliases.conf
@@ -1,4 +1,5 @@
 # vim: ft=tmux
 
-set -ga command-alias kill='kill-session -t'
-set -ga command-alias k='kill-session -t'
\ No newline at end of file
+set -g command-alias[101] kill='kill-session -t'
+set -g command-alias[102] k='kill-session -t'
+set -g command-alias[103] reload-config='source-file ~/.config/tmux/tmux.conf ; display-message "Config reloaded..."'
\ No newline at end of file
diff --git a/home/user/.config/tmux/mappings.conf b/home/user/.config/tmux/mappings.conf
index 0ddbe74..981f239 100644
--- a/home/user/.config/tmux/mappings.conf
+++ b/home/user/.config/tmux/mappings.conf
@@ -32,8 +32,9 @@ bind n command-prompt -p "New session:" "new-session -A -d -s '%1' -c ~ \; switc
 bind x confirm-before -p "kill current session? (y/n)" "switch-client -l \; kill-session -t '#S'"
 bind k confirm-before -p "kill current pane? (y/n)" "kill-pane"
 
+
 # Kill last session
-bind X confirm-before -p "kill last session? (y/n)" "kill-session -t '#{client_last_session}'"
+bind X confirm-before -p "kill last session [#{client_last_session}]? (y/n)" "kill-session -t #{client_last_session} \; display-message \"Killed last session\""
 
 
 # SSH Session
@@ -53,7 +54,7 @@ bind l confirm-before -p "lock tmux? (y/n)" lock-session
 
 
 # Reload config
-bind r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded..."
+bind r reload-config
 bind R if-shell "git -C ~/dotfiles pull" "source-file '$HOME/.config/tmux/tmux.conf' \; display-message 'Config reloaded...'" "display-message 'Error while fetching config'"
 
 
diff --git a/home/user/.config/tmux/tmux.conf b/home/user/.config/tmux/tmux.conf
index 9d4e5de..709f280 100644
--- a/home/user/.config/tmux/tmux.conf
+++ b/home/user/.config/tmux/tmux.conf
@@ -1,9 +1,9 @@
 # vim: ft=tmux
 
-source-file "$HOME/.config/tmux/mappings.conf"
 source-file "$HOME/.config/tmux/options.conf"
-source-file "$HOME/.config/tmux/style.conf"
 source-file "$HOME/.config/tmux/aliases.conf"
+source-file "$HOME/.config/tmux/mappings.conf"
+source-file "$HOME/.config/tmux/style.conf"
 
 if-shell 'test -e "$HOME/.config/tmux/local.conf"' 'source-file "$HOME/.config/tmux/local.conf"'
 
diff --git a/home/user/.config/zsh/sourcer b/home/user/.config/zsh/sourcer
index 0d923f7..6f185e4 100644
--- a/home/user/.config/zsh/sourcer
+++ b/home/user/.config/zsh/sourcer
@@ -1,3 +1,5 @@
+# vim: ft=zsh
+
 _so() {
     [ -r "$1" ] && [ -f "$1" ] && source "$1"
 }
@@ -5,7 +7,6 @@ _so() {
 
 _so "$XDG_CONFIG_HOME/bash/export"
 _so "$XDG_CONFIG_HOME/bash/aliases"
-_so "$XDG_CONFIG_HOME/bash/completion"
 _so "$XDG_CONFIG_HOME/bash/functions"
 _so "$XDG_CONFIG_HOME/bash/hosts/$HOST"