From 5561023ea8a6dc39412b2353adb749afc4dfdd37 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 4 Feb 2024 10:15:36 +0200
Subject: [PATCH] Switch from tmux to zellij

Also remapped some nvim and zsh keybinds to not conflict with zellij
---
 config.toml                                 | 10 +++++-----
 home/.config/nvim/lua/plugins/telescope.lua |  4 ++--
 home/.config/nvim/lua/plugins/which-key.lua |  4 ++--
 home/.config/zellij/config.kdl              | 11 +++++++++++
 home/.config/zellij/themes/kanagawa.kdl     | 15 +++++++++++++++
 home/.config/zsh/01-tmux.zsh                |  8 --------
 home/.config/zsh/01-zellij.zsh              |  9 +++++++++
 home/.config/zsh/06-keybinds.zsh            |  4 ++++
 8 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 home/.config/zellij/config.kdl
 create mode 100644 home/.config/zellij/themes/kanagawa.kdl
 delete mode 100644 home/.config/zsh/01-tmux.zsh
 create mode 100644 home/.config/zsh/01-zellij.zsh

diff --git a/config.toml b/config.toml
index a3f87bf7..ab90a418 100644
--- a/config.toml
+++ b/config.toml
@@ -154,10 +154,6 @@ src = ".local/share/applications/steam-native.desktop"
 dst = "~/.config/telegram-desktop/lang.strings"
 src = ".config/telegram-desktop/lang.strings"
 
-[dotfiles."f_tmux.conf"]
-dst = "~/.tmux.conf"
-src = ".tmux.conf"
-
 [dotfiles.f_youtube-dl_config]
 dst = "~/.config/youtube-dl/config"
 src = ".config/youtube-dl/config"
@@ -250,6 +246,10 @@ src = ".npmrc"
 dst = "~/.npmrc"
 chmod = "600"
 
+[dotfiles.d_zellij]
+src = ".config/zellij"
+dst = "~/.config/zellij"
+
 [profiles.pacman]
 dotfiles = ["f_makepkg.conf", "f_paru.conf"]
 
@@ -267,7 +267,7 @@ dotfiles = [
   "f_ranger.conf",
   "f_ranger_commands.py",
   "f_rtv.cfg",
-  "f_tmux.conf",
+  "d_zellij",
   "f_zshrc",
   "f_npmrc",
 ]
diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua
index 15fd534e..c0842a3d 100644
--- a/home/.config/nvim/lua/plugins/telescope.lua
+++ b/home/.config/nvim/lua/plugins/telescope.lua
@@ -68,7 +68,7 @@ return {
   keys = {
     {
       desc = "Open Telescope",
-      "<C-s>",
+      "t",
       "<cmd>Telescope<cr>",
     },
     {
@@ -88,7 +88,7 @@ return {
     },
     {
       desc = "Change to a project",
-      "<C-p>",
+      "<leader>p",
       "<cmd>Telescope projects<cr>",
     },
   },
diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua
index 608d1047..0a65beac 100644
--- a/home/.config/nvim/lua/plugins/which-key.lua
+++ b/home/.config/nvim/lua/plugins/which-key.lua
@@ -24,8 +24,8 @@ return {
     }, { prefix = "<leader>" })
 
     wk.register({
-      ["<C-n>"] = { "<cmd>bnext<cr>", "Next buffer" },
-      ["<C-b>"] = { "<cmd>bprevious<cr>", "Previous buffer" },
+      ["<Tab>"] = { "<cmd>bnext<cr>", "Next buffer" },
+      ["<S-Tab>"] = { "<cmd>bprevious<cr>", "Previous buffer" },
     })
 
     -- Exit terminal insert mode with esc
diff --git a/home/.config/zellij/config.kdl b/home/.config/zellij/config.kdl
new file mode 100644
index 00000000..d3a0e53f
--- /dev/null
+++ b/home/.config/zellij/config.kdl
@@ -0,0 +1,11 @@
+theme "kanagawa"
+
+keybinds {
+    unbind "Ctrl g"
+    locked {
+        bind "Ctrl l" { SwitchToMode "Normal"; }
+    }
+    shared_except "locked" {
+        bind "Ctrl l" { SwitchToMode "Locked"; }
+    }
+}
diff --git a/home/.config/zellij/themes/kanagawa.kdl b/home/.config/zellij/themes/kanagawa.kdl
new file mode 100644
index 00000000..b85c184b
--- /dev/null
+++ b/home/.config/zellij/themes/kanagawa.kdl
@@ -0,0 +1,15 @@
+themes {
+	kanagawa {
+		fg "#dcd7ba"
+	  bg "#1f1f28"
+	  black "#090618"
+	  red "#c34043"
+	  green "#76946a"
+	  yellow "#c0a36e"
+	  blue "#7e9cd8"
+	  magenta "#957fb8"
+	  cyan "#6a9589"
+	  white "#c8c093"
+	  orange "#ffa066"
+	}
+}
diff --git a/home/.config/zsh/01-tmux.zsh b/home/.config/zsh/01-tmux.zsh
deleted file mode 100644
index 55d3f0c7..00000000
--- a/home/.config/zsh/01-tmux.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Launch tmux if logging in over ssh
-if [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
-  if tmux has-session -t ssh_tmux 2>/dev/null; then
-    exec tmux -2 attach-session -t ssh_tmux
-  else
-    exec tmux -2 new-session -s ssh_tmux
-  fi
-fi
diff --git a/home/.config/zsh/01-zellij.zsh b/home/.config/zsh/01-zellij.zsh
new file mode 100644
index 00000000..2b68601c
--- /dev/null
+++ b/home/.config/zsh/01-zellij.zsh
@@ -0,0 +1,9 @@
+if [[ -z "$ZELLIJ" ]]; then
+  # Launch or attach to existing session if logging in over ssh
+  if [[ -n "$SSH_CONNECTION" ]]; then
+    exec zellij attach -s SSH
+  # Launch a new local session otherwise
+  else
+    exec zellij
+  fi
+fi
diff --git a/home/.config/zsh/06-keybinds.zsh b/home/.config/zsh/06-keybinds.zsh
index 7f0c95d2..bea3d85a 100644
--- a/home/.config/zsh/06-keybinds.zsh
+++ b/home/.config/zsh/06-keybinds.zsh
@@ -44,3 +44,7 @@ bindkey -M vicmd e edit-command-line
 
 # bind delete in normal mode
 bindkey -M vicmd '^[[3~' delete-char
+
+# Rebind fzf to ctrl+f
+bindkey '^F' fzf-file-widget
+bindkey '^T' transpose-chars