From 5015a08ab910d5adaa4b94b9a75edb29667491ee Mon Sep 17 00:00:00 2001
From: Marco Thomas <github@marcothms.de>
Date: Sun, 2 Jun 2024 14:42:30 +0200
Subject: [PATCH] tmux/kitty: re-enable tmux

---
 .../.config/environment.d/envvars.conf        |  3 +
 files/kitty/.config/kitty/kitty.conf          | 62 ++++++++++---------
 files/tmux/.tmux.conf                         | 23 ++++---
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/files/environment/.config/environment.d/envvars.conf b/files/environment/.config/environment.d/envvars.conf
index 5d7417b..92a6827 100644
--- a/files/environment/.config/environment.d/envvars.conf
+++ b/files/environment/.config/environment.d/envvars.conf
@@ -2,6 +2,9 @@ PATH=$HOME/.dots/scripts:$HOME/.cargo/bin:$HOME/.ghcup/bin:$HOME/.local/bin:$HOM
 EDITOR=hx
 VISUAL=hx
 
+# XXX: render shadow on wayland
+KITTY_DISABLE_WAYLAND=1
+
 # support jp input in gnome
 GTK_IM_MODULE=ibus
 QT_IM_MODULE=ibus
diff --git a/files/kitty/.config/kitty/kitty.conf b/files/kitty/.config/kitty/kitty.conf
index 5637eaf..3a6505e 100644
--- a/files/kitty/.config/kitty/kitty.conf
+++ b/files/kitty/.config/kitty/kitty.conf
@@ -192,7 +192,7 @@ disable_ligatures cursor
 #: curl oscillates. With sparse the curl will peak once per character,
 #: with dense twice.
 
-text_composition_strategy 2.5
+text_composition_strategy 3
 
 #: Control how kitty composites text glyphs onto the background color.
 #: The default value of platform tries for text rendering as close to
@@ -740,7 +740,7 @@ window_alert_on_bell no
 #: Window layout {{{
 
 remember_window_size  no
-initial_window_width  80c
+initial_window_width  100c
 initial_window_height 30c
 
 #: If enabled, the OS Window size will be remembered so that new
@@ -893,7 +893,7 @@ hide_window_decorations yes
 #: insensitive, from the set [0-9A-Z]. Specify your preference as a
 #: string of characters.
 
-confirm_os_window_close 1
+confirm_os_window_close 0
 
 #: Ask for confirmation when closing an OS window or a tab with at
 #: least this number of kitty windows in it by window manager (e.g.
@@ -2394,37 +2394,39 @@ term xterm-256color
 map ctrl+t launch --cwd=current --type=tab
 map ctrl+shift+t launch --type=tab
 
-map alt+1 goto_tab 1
-map alt+2 goto_tab 2
-map alt+3 goto_tab 3
-map alt+4 goto_tab 4
-map alt+5 goto_tab 5
-map alt+6 goto_tab 6
-map alt+7 goto_tab 7
-map alt+8 goto_tab 8
-map alt+9 goto_tab 8
-map alt+0 goto_tab 0
+# map alt+1 goto_tab 1
+# map alt+2 goto_tab 2
+# map alt+3 goto_tab 3
+# map alt+4 goto_tab 4
+# map alt+5 goto_tab 5
+# map alt+6 goto_tab 6
+# map alt+7 goto_tab 7
+# map alt+8 goto_tab 8
+# map alt+9 goto_tab 8
+# map alt+0 goto_tab 0
 
-# Window management
-map ctrl+enter new_window_with_cwd
-enabled_layouts tall,stack
-map alt+f toggle_layout stack
+# # Window management
+# map ctrl+enter new_window_with_cwd
+# # switch with ctrl+shift+l
+# enabled_layouts tall,fat,stack
+# map alt+f toggle_layout stack
 
-map alt+shift+k move_window up
-map alt+shift+h move_window left
-map alt+shift+l move_window right
-map alt+shift+j move_window down
-map alt+k neighboring_window up
-map alt+h neighboring_window left
-map alt+l neighboring_window right
-map alt+j neighboring_window down
-map ctrl+left resize_window narrower
-map ctrl+right resize_window wider
-map ctrl+up resize_window taller
-map ctrl+down resize_window shorter
-map ctrl+backspace resize_window reset
+# map alt+shift+k move_window up
+# map alt+shift+h move_window left
+# map alt+shift+l move_window right
+# map alt+shift+j move_window down
 
+# map alt+k neighboring_window up
+# map alt+h neighboring_window left
+# map alt+l neighboring_window right
+# map alt+j neighboring_window down
 
+# map ctrl+left resize_window narrower
+# map ctrl+right resize_window wider
+# map ctrl+up resize_window taller
+# map ctrl+down resize_window shorter
+
+# map ctrl+backspace resize_window reset
 
 # BEGIN_KITTY_THEME
 # Everforest Light Medium
diff --git a/files/tmux/.tmux.conf b/files/tmux/.tmux.conf
index fed9026..0f136b7 100644
--- a/files/tmux/.tmux.conf
+++ b/files/tmux/.tmux.conf
@@ -12,21 +12,22 @@ set -ga terminal-overrides ",*256col*:Tc,alacritty:Tc"
 bind-key -n M-v split-window -h -c "#{pane_current_path}"
 bind-key -n M-s split-window -v -c "#{pane_current_path}"
 
-# pane selection
+# new windows
+bind-key -n M-c new-window -c "#{pane_current_path}"
+
+# vi-style pane selection
 bind-key -n M-h select-pane -L
 bind-key -n M-j select-pane -D
 bind-key -n M-k select-pane -U
 bind-key -n M-l select-pane -R
 
-# pane / window modifications
+# pane zoom
 bind-key -n M-f resize-pane -Z
-# use `set automatic-rename on` to reset
+
+# window rename
 bind-key -n M-, command-prompt -p "Rename window:" "rename-window '%%'"
 bind-key -n M-< set automatic-rename on
 
-# new windows
-bind-key -n M-c new-window -c "#{pane_current_path}"
-
 # navigate windows
 bind-key -n M-1 select-window -t 1
 bind-key -n M-2 select-window -t 2
@@ -39,13 +40,16 @@ bind-key -n M-8 select-window -t 8
 bind-key -n M-9 select-window -t 9
 
 # swap panes
-bind-key -n 'M-H' swap-pane -D
-bind-key -n 'M-L' swap-pane -U
+bind-key -n 'M-J' swap-pane -D
+bind-key -n 'M-K' swap-pane -U
 
 # move panes to and from windows
 bind-key -n 'M-t' command-prompt -p "Send pane to:" "join-pane -t :'%%'"
 bind-key -n 'M-!' select-layout even-horizontal
 bind-key -n 'M-@' select-layout even-vertical
+bind-key -n 'M-#' select-layout main-vertical
+
+set -g main-pane-width 40%
 
 # resize panes
 bind-key -n 'M-Left' resize-pane -L 5
@@ -75,6 +79,9 @@ set-option -g status-interval 1
 set-option -g set-titles on
 set-option -g set-titles-string "#H: #W"
 
+# Make inactive border a bit less noticeable
+set -g pane-border-style fg="#e3ddcc"
+
 # Status
 set -g status-style "bg=default"
 set -g status-right "#S @ #H [%H:%M]"