Do not autostart/attach zellij

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "alacritty-theme"]
 	path = alacritty-theme
 	url = git@github.com:alacritty/alacritty-theme
-[submodule "yazi/flavors"]
-	path = yazi/flavors
-	url = https://github.com/yazi-rs/flavors.git

aliases.d/helix.zsh

@@ -1,3 +1,5 @@
 if (( $+commands[helix] )); then
     alias hx="helix"
+elif (( $+commands[hx] )); then
+    alias helix="hx"
 fi

bombadil.toml

@@ -47,10 +47,6 @@ mimeapps = { source = "mimeapps.list", target = ".config/mimeapps.list" }
 # navi
 navi = { source = "navi", target = ".config/navi" }
 
-# yazi
-yazi_flavors = { source = "yazi/flavors", target = ".config/yazi/flavors", ignore = [ "*.md", "scripts", "LICENSE", "*.json", "*.yaml", ".git", ".github", ".gitignore" ] }
-yazi_theme = { source = "yazi/theme.toml", target = ".config/yazi/theme.toml" }
-
 # zellij
 zellij = { source = "zellij", target = ".config/zellij" }
 

dark.toml

@@ -3,4 +3,3 @@ alacritty_theme = "Catppuccin-Macchiato"
 helix_theme = "catppuccin_mocha"
 zellij_theme = "catppuccin-macchiato"
 bat_theme = "Catppuccin Mocha"
-yazi_flavor = "catppuccin-mocha"

helix/config.toml

@@ -23,8 +23,41 @@ wrap-at-text-width = true
 center = ["version-control"]
 
 [keys.normal]
-C-r = ":config-reload"
+C-R = ":config-reload"
+
 _ = { n = ":set whitespace.render none", a = ":set whitespace.render all" }
 
+# Git integration with lazygit
+A-g = [
+    ":write-all",
+    ":insert-output lazygit >/dev/tty",
+    ":redraw",
+    ":reload-all"
+]
+
+# Search and replace with scooter
+C-r = [
+    ":write-all",
+    ":insert-output scooter >/dev/tty",
+    ":redraw",
+    ":reload-all"
+]
+
 [keys.normal.space]
 i = ":toggle lsp.display-inlay-hints"
+
+# File explorer with yazi
+e = [
+  ":sh rm -f /tmp/unique-file-c5140c67",
+  ":insert-output yazi '%{buffer_name}' --chooser-file=/tmp/unique-file-c5140c67",
+  ":insert-output echo \"x1b[?1049h\" > /dev/tty",
+  ":open %sh{cat /tmp/unique-file-c5140c67}",
+  ":redraw",
+]
+E = [
+  ":sh rm -f /tmp/unique-file-bea21125",
+  ":insert-output yazi '%{workspace_directory}' --chooser-file=/tmp/unique-file-bea21125",
+  ":insert-output echo \"x1b[?1049h\" > /dev/tty",
+  ":open %sh{cat /tmp/unique-file-bea21125}",
+  ":redraw",
+]

light.toml

@@ -3,4 +3,3 @@ alacritty_theme = "Catppuccin-Latte"
 helix_theme = "catppuccin_latte"
 zellij_theme = "catppuccin-latte"
 bat_theme = "Catppuccin Latte"
-yazi_flavor = "catppuccin-latte"

yazi/theme.toml

@@ -1,3 +0,0 @@
-[flavor]
-dark = "{{yazi_flavor}}"
-light = "{{yazi_flavor}}"

zellij/config.kdl

@@ -1,179 +1,179 @@
 // If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
-keybinds {
+// keybinds {
-    normal {
+//     normal {
-        // uncomment this and adjust key if using copy_on_select=false
+//         // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
+//         // bind "Alt c" { Copy; }
-    }
+//     }
-    locked {
+//     locked {
-        bind "Ctrl g" { SwitchToMode "Normal"; }
+//         bind "Ctrl g" { SwitchToMode "Normal"; }
-    }
+//     }
-    resize {
+//     resize {
-        bind "Ctrl n" { SwitchToMode "Normal"; }
+//         bind "Ctrl n" { SwitchToMode "Normal"; }
-        bind "h" "Left" { Resize "Increase Left"; }
+//         bind "h" "Left" { Resize "Increase Left"; }
-        bind "j" "Down" { Resize "Increase Down"; }
+//         bind "j" "Down" { Resize "Increase Down"; }
-        bind "k" "Up" { Resize "Increase Up"; }
+//         bind "k" "Up" { Resize "Increase Up"; }
-        bind "l" "Right" { Resize "Increase Right"; }
+//         bind "l" "Right" { Resize "Increase Right"; }
-        bind "H" { Resize "Decrease Left"; }
+//         bind "H" { Resize "Decrease Left"; }
-        bind "J" { Resize "Decrease Down"; }
+//         bind "J" { Resize "Decrease Down"; }
-        bind "K" { Resize "Decrease Up"; }
+//         bind "K" { Resize "Decrease Up"; }
-        bind "L" { Resize "Decrease Right"; }
+//         bind "L" { Resize "Decrease Right"; }
-        bind "=" "+" { Resize "Increase"; }
+//         bind "=" "+" { Resize "Increase"; }
-        bind "-" { Resize "Decrease"; }
+//         bind "-" { Resize "Decrease"; }
-    }
+//     }
-    pane {
+//     pane {
-        bind "Ctrl p" { SwitchToMode "Normal"; }
+//         bind "Ctrl p" { SwitchToMode "Normal"; }
-        bind "h" "Left" { MoveFocus "Left"; }
+//         bind "h" "Left" { MoveFocus "Left"; }
-        bind "l" "Right" { MoveFocus "Right"; }
+//         bind "l" "Right" { MoveFocus "Right"; }
-        bind "j" "Down" { MoveFocus "Down"; }
+//         bind "j" "Down" { MoveFocus "Down"; }
-        bind "k" "Up" { MoveFocus "Up"; }
+//         bind "k" "Up" { MoveFocus "Up"; }
-        bind "p" { SwitchFocus; }
+//         bind "p" { SwitchFocus; }
-        bind "n" { NewPane; SwitchToMode "Normal"; }
+//         bind "n" { NewPane; SwitchToMode "Normal"; }
-        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
+//         bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
-        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
+//         bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
-        bind "x" { CloseFocus; SwitchToMode "Normal"; }
+//         bind "x" { CloseFocus; SwitchToMode "Normal"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+//         bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
+//         bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
+//         bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
+//         bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
-        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
+//         bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
-    }
+//     }
-    move {
+//     move {
-        bind "Ctrl h" { SwitchToMode "Normal"; }
+//         bind "Ctrl h" { SwitchToMode "Normal"; }
-        bind "n" "Tab" { MovePane; }
+//         bind "n" "Tab" { MovePane; }
-        bind "h" "Left" { MovePane "Left"; }
+//         bind "h" "Left" { MovePane "Left"; }
-        bind "j" "Down" { MovePane "Down"; }
+//         bind "j" "Down" { MovePane "Down"; }
-        bind "k" "Up" { MovePane "Up"; }
+//         bind "k" "Up" { MovePane "Up"; }
-        bind "l" "Right" { MovePane "Right"; }
+//         bind "l" "Right" { MovePane "Right"; }
-    }
+//     }
-    tab {
+//     tab {
-        bind "Ctrl t" { SwitchToMode "Normal"; }
+//         bind "Ctrl t" { SwitchToMode "Normal"; }
-        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
+//         bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
-        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
+//         bind "h" "Left" "Up" "k" { GoToPreviousTab; }
-        bind "l" "Right" "Down" "j" { GoToNextTab; }
+//         bind "l" "Right" "Down" "j" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "Normal"; }
+//         bind "n" { NewTab; SwitchToMode "Normal"; }
-        bind "x" { CloseTab; SwitchToMode "Normal"; }
+//         bind "x" { CloseTab; SwitchToMode "Normal"; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
+//         bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
-        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
+//         bind "1" { GoToTab 1; SwitchToMode "Normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
+//         bind "2" { GoToTab 2; SwitchToMode "Normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
+//         bind "3" { GoToTab 3; SwitchToMode "Normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
+//         bind "4" { GoToTab 4; SwitchToMode "Normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
+//         bind "5" { GoToTab 5; SwitchToMode "Normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
+//         bind "6" { GoToTab 6; SwitchToMode "Normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
+//         bind "7" { GoToTab 7; SwitchToMode "Normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
+//         bind "8" { GoToTab 8; SwitchToMode "Normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
+//         bind "9" { GoToTab 9; SwitchToMode "Normal"; }
-        bind "Tab" { ToggleTab; }
+//         bind "Tab" { ToggleTab; }
-    }
+//     }
-    scroll {
+//     scroll {
-        bind "Ctrl s" { SwitchToMode "Normal"; }
+//         bind "Ctrl s" { SwitchToMode "Normal"; }
-        bind "e" { EditScrollback; SwitchToMode "Normal"; }
+//         bind "e" { EditScrollback; SwitchToMode "Normal"; }
-        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
+//         bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+//         bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
+//         bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
+//         bind "k" "Up" { ScrollUp; }
-        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+//         bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+//         bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
+//         bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
+//         bind "u" { HalfPageScrollUp; }
-        // uncomment this and adjust key if using copy_on_select=false
+//         // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
+//         // bind "Alt c" { Copy; }
-    }
+//     }
-    search {
+//     search {
-        bind "Ctrl s" { SwitchToMode "Normal"; }
+//         bind "Ctrl s" { SwitchToMode "Normal"; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
+//         bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
+//         bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
+//         bind "k" "Up" { ScrollUp; }
-        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
+//         bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
+//         bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
+//         bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
+//         bind "u" { HalfPageScrollUp; }
-        bind "n" { Search "down"; }
+//         bind "n" { Search "down"; }
-        bind "p" { Search "up"; }
+//         bind "p" { Search "up"; }
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
+//         bind "c" { SearchToggleOption "CaseSensitivity"; }
-        bind "w" { SearchToggleOption "Wrap"; }
+//         bind "w" { SearchToggleOption "Wrap"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
+//         bind "o" { SearchToggleOption "WholeWord"; }
-    }
+//     }
-    entersearch {
+//     entersearch {
-        bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
+//         bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
-        bind "Enter" { SwitchToMode "Search"; }
+//         bind "Enter" { SwitchToMode "Search"; }
-    }
+//     }
-    renametab {
+//     renametab {
-        bind "Ctrl c" { SwitchToMode "Normal"; }
+//         bind "Ctrl c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
+//         bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
-    }
+//     }
-    renamepane {
+//     renamepane {
-        bind "Ctrl c" { SwitchToMode "Normal"; }
+//         bind "Ctrl c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
+//         bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
-    }
+//     }
-    session {
+//     session {
-        bind "Ctrl o" { SwitchToMode "Normal"; }
+//         bind "Ctrl o" { SwitchToMode "Normal"; }
-        bind "Ctrl s" { SwitchToMode "Scroll"; }
+//         bind "Ctrl s" { SwitchToMode "Scroll"; }
-        bind "d" { Detach; }
+//         bind "d" { Detach; }
-    }
+//     }
-    tmux {
+//     tmux {
-        bind "[" { SwitchToMode "Scroll"; }
+//         bind "[" { SwitchToMode "Scroll"; }
-        bind "Ctrl b" { Write 2; SwitchToMode "Normal"; }
+//         bind "Ctrl b" { Write 2; SwitchToMode "Normal"; }
-        bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
+//         bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
-        bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
+//         bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
-        bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
+//         bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
-        bind "c" { NewTab; SwitchToMode "Normal"; }
+//         bind "c" { NewTab; SwitchToMode "Normal"; }
-        bind "," { SwitchToMode "RenameTab"; }
+//         bind "," { SwitchToMode "RenameTab"; }
-        bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
+//         bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
-        bind "n" { GoToNextTab; SwitchToMode "Normal"; }
+//         bind "n" { GoToNextTab; SwitchToMode "Normal"; }
-        bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
+//         bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
-        bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
+//         bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
-        bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
+//         bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
-        bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
+//         bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
-        bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
+//         bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
-        bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
+//         bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
-        bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
+//         bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
-        bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
+//         bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
-        bind "o" { FocusNextPane; }
+//         bind "o" { FocusNextPane; }
-        bind "d" { Detach; }
+//         bind "d" { Detach; }
-    }
+//     }
-    shared_except "locked" {
+//     shared_except "locked" {
-        bind "Ctrl g" { SwitchToMode "Locked"; }
+//         bind "Ctrl g" { SwitchToMode "Locked"; }
-        bind "Ctrl q" { Quit; }
+//         bind "Ctrl q" { Quit; }
-        bind "Alt n" { NewPane; }
+//         bind "Alt n" { NewPane; }
-        bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
+//         bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
-        bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
+//         bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
-        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
+//         bind "Alt j" "Alt Down" { MoveFocus "Down"; }
-        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
+//         bind "Alt k" "Alt Up" { MoveFocus "Up"; }
-        bind "Alt =" "Alt +" { Resize "Increase"; }
+//         bind "Alt =" "Alt +" { Resize "Increase"; }
-        bind "Alt -" { Resize "Decrease"; }
+//         bind "Alt -" { Resize "Decrease"; }
-    }
+//     }
-    shared_except "normal" "locked" {
+//     shared_except "normal" "locked" {
-        bind "Enter" "Esc" { SwitchToMode "Normal"; }
+//         bind "Enter" "Esc" { SwitchToMode "Normal"; }
-    }
+//     }
-    shared_except "pane" "locked" {
+//     shared_except "pane" "locked" {
-        bind "Ctrl p" { SwitchToMode "Pane"; }
+//         bind "Ctrl p" { SwitchToMode "Pane"; }
-    }
+//     }
-    shared_except "resize" "locked" {
+//     shared_except "resize" "locked" {
-        bind "Ctrl n" { SwitchToMode "Resize"; }
+//         bind "Ctrl n" { SwitchToMode "Resize"; }
-    }
+//     }
-    shared_except "scroll" "locked" {
+//     shared_except "scroll" "locked" {
-        bind "Ctrl s" { SwitchToMode "Scroll"; }
+//         bind "Ctrl s" { SwitchToMode "Scroll"; }
-    }
+//     }
-    shared_except "session" "locked" {
+//     shared_except "session" "locked" {
-        bind "Ctrl o" { SwitchToMode "Session"; }
+//         bind "Ctrl o" { SwitchToMode "Session"; }
-    }
+//     }
-    shared_except "tab" "locked" {
+//     shared_except "tab" "locked" {
-        bind "Ctrl t" { SwitchToMode "Tab"; }
+//         bind "Ctrl t" { SwitchToMode "Tab"; }
-    }
+//     }
-    shared_except "move" "locked" {
+//     shared_except "move" "locked" {
-        bind "Ctrl h" { SwitchToMode "Move"; }
+//         bind "Ctrl h" { SwitchToMode "Move"; }
-    }
+//     }
-    shared_except "tmux" "locked" {
+//     shared_except "tmux" "locked" {
-        bind "Ctrl b" { SwitchToMode "Tmux"; }
+//         bind "Ctrl b" { SwitchToMode "Tmux"; }
-    }
+//     }
-}
+// }
 
-plugins {
+// plugins {
-    tab-bar { path "tab-bar"; }
+//     tab-bar { path "tab-bar"; }
-    status-bar { path "status-bar"; }
+//     status-bar { path "status-bar"; }
-    strider { path "strider"; }
+//     strider { path "strider"; }
-    compact-bar { path "compact-bar"; }
+//     compact-bar { path "compact-bar"; }
-}
+// }
 
 // Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
 // eg. when terminal window with an active zellij session is closed
@@ -248,7 +248,7 @@ theme "{{zellij_theme}}"
 // The name of the default layout to load on startup
 // Default: "default"
 //
-// default_layout "compact"
+default_layout "compact"
 
 // Choose the mode that zellij uses when starting up.
 // Default: normal

zsh.d/resume.zsh

@@ -0,0 +1,9 @@
+# Allow Ctrl-z to toggle between suspend and resume
+function Resume {
+  fg
+  zle push-input
+  BUFFER=""
+  zle accept-line
+}
+zle -N Resume
+bindkey "^Z" Resume

zsh.d/zellij.zsh

@@ -1,8 +1,8 @@
 # zellij
 if (( $+commands[zellij] )); then
-  ZELLIJ_AUTO_ATTACH=true
+  # Uncomment to start zellij automatically
-  eval "$(zellij setup --generate-auto-start zsh)"
+  # ZELLIJ_AUTO_ATTACH=true
-
+  # eval "$(zellij setup --generate-auto-start zsh)"
 
   if (( $+commands[sk] )); then
     za() {

zshenv.zsh

@@ -1,12 +1,13 @@
-export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock"
+# export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock"
-export DOCKER_SOCKET="$XDG_RUNTIME_DIR/docker.sock"
+# export DOCKER_SOCKET="$XDG_RUNTIME_DIR/docker.sock"
-export EDITOR="helix"
+export EDITOR="hx"
 export FINDER="sk"
 export GPG_TTY=$(tty)
-export HELIX_RUNTIME="$HOME/src/helix/runtime"
+# export HELIX_RUNTIME="$HOME/src/helix/runtime"
+export HELIX_RUNTIME="/usr/lib/helix/runtime"
 export NVM_DIR="$HOME/.nvm"
 export SKIM_DEFAULT_COMMAND="git ls-tree -r --name-only HEAD || rg --files"
-export VISUAL="helix"
+export VISUAL="hx"
 
 fpath+=(~/.zsh/completions)