Disable pane frames

.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/flavors

@@ -1 +0,0 @@
-Subproject commit 68326b4ca4b5b66da3d4a4cce3050e5e950aade5

yazi/theme.toml

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

zellij/config.kdl

@@ -1,286 +1,10 @@
-// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
-keybinds {
-    normal {
-        // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
-    }
-    locked {
-        bind "Ctrl g" { SwitchToMode "Normal"; }
-    }
-    resize {
-        bind "Ctrl n" { SwitchToMode "Normal"; }
-        bind "h" "Left" { Resize "Increase Left"; }
-        bind "j" "Down" { Resize "Increase Down"; }
-        bind "k" "Up" { Resize "Increase Up"; }
-        bind "l" "Right" { Resize "Increase Right"; }
-        bind "H" { Resize "Decrease Left"; }
-        bind "J" { Resize "Decrease Down"; }
-        bind "K" { Resize "Decrease Up"; }
-        bind "L" { Resize "Decrease Right"; }
-        bind "=" "+" { Resize "Increase"; }
-        bind "-" { Resize "Decrease"; }
-    }
-    pane {
-        bind "Ctrl p" { SwitchToMode "Normal"; }
-        bind "h" "Left" { MoveFocus "Left"; }
-        bind "l" "Right" { MoveFocus "Right"; }
-        bind "j" "Down" { MoveFocus "Down"; }
-        bind "k" "Up" { MoveFocus "Up"; }
-        bind "p" { SwitchFocus; }
-        bind "n" { NewPane; SwitchToMode "Normal"; }
-        bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
-        bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
-        bind "x" { CloseFocus; SwitchToMode "Normal"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
-        bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
-    }
-    move {
-        bind "Ctrl h" { SwitchToMode "Normal"; }
-        bind "n" "Tab" { MovePane; }
-        bind "h" "Left" { MovePane "Left"; }
-        bind "j" "Down" { MovePane "Down"; }
-        bind "k" "Up" { MovePane "Up"; }
-        bind "l" "Right" { MovePane "Right"; }
-    }
-    tab {
-        bind "Ctrl t" { SwitchToMode "Normal"; }
-        bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
-        bind "h" "Left" "Up" "k" { GoToPreviousTab; }
-        bind "l" "Right" "Down" "j" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "Normal"; }
-        bind "x" { CloseTab; SwitchToMode "Normal"; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
-        bind "1" { GoToTab 1; SwitchToMode "Normal"; }
-        bind "2" { GoToTab 2; SwitchToMode "Normal"; }
-        bind "3" { GoToTab 3; SwitchToMode "Normal"; }
-        bind "4" { GoToTab 4; SwitchToMode "Normal"; }
-        bind "5" { GoToTab 5; SwitchToMode "Normal"; }
-        bind "6" { GoToTab 6; SwitchToMode "Normal"; }
-        bind "7" { GoToTab 7; SwitchToMode "Normal"; }
-        bind "8" { GoToTab 8; SwitchToMode "Normal"; }
-        bind "9" { GoToTab 9; SwitchToMode "Normal"; }
-        bind "Tab" { ToggleTab; }
-    }
-    scroll {
-        bind "Ctrl s" { SwitchToMode "Normal"; }
-        bind "e" { EditScrollback; SwitchToMode "Normal"; }
-        bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
-        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-        // uncomment this and adjust key if using copy_on_select=false
-        // bind "Alt c" { Copy; }
-    }
-    search {
-        bind "Ctrl s" { SwitchToMode "Normal"; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
-        bind "j" "Down" { ScrollDown; }
-        bind "k" "Up" { ScrollUp; }
-        bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
-        bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
-        bind "d" { HalfPageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-        bind "n" { Search "down"; }
-        bind "p" { Search "up"; }
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
-        bind "w" { SearchToggleOption "Wrap"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
-    }
-    entersearch {
-        bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
-        bind "Enter" { SwitchToMode "Search"; }
-    }
-    renametab {
-        bind "Ctrl c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
-    }
-    renamepane {
-        bind "Ctrl c" { SwitchToMode "Normal"; }
-        bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
-    }
-    session {
-        bind "Ctrl o" { SwitchToMode "Normal"; }
-        bind "Ctrl s" { SwitchToMode "Scroll"; }
-        bind "d" { Detach; }
-    }
-    tmux {
-        bind "[" { SwitchToMode "Scroll"; }
-        bind "Ctrl b" { Write 2; SwitchToMode "Normal"; }
-        bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
-        bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
-        bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
-        bind "c" { NewTab; SwitchToMode "Normal"; }
-        bind "," { SwitchToMode "RenameTab"; }
-        bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
-        bind "n" { GoToNextTab; SwitchToMode "Normal"; }
-        bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
-        bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
-        bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
-        bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
-        bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
-        bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
-        bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
-        bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
-        bind "o" { FocusNextPane; }
-        bind "d" { Detach; }
-    }
-    shared_except "locked" {
-        bind "Ctrl g" { SwitchToMode "Locked"; }
-        bind "Ctrl q" { Quit; }
-        bind "Alt n" { NewPane; }
-        bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
-        bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
-        bind "Alt j" "Alt Down" { MoveFocus "Down"; }
-        bind "Alt k" "Alt Up" { MoveFocus "Up"; }
-        bind "Alt =" "Alt +" { Resize "Increase"; }
-        bind "Alt -" { Resize "Decrease"; }
-    }
-    shared_except "normal" "locked" {
-        bind "Enter" "Esc" { SwitchToMode "Normal"; }
-    }
-    shared_except "pane" "locked" {
-        bind "Ctrl p" { SwitchToMode "Pane"; }
-    }
-    shared_except "resize" "locked" {
-        bind "Ctrl n" { SwitchToMode "Resize"; }
-    }
-    shared_except "scroll" "locked" {
-        bind "Ctrl s" { SwitchToMode "Scroll"; }
-    }
-    shared_except "session" "locked" {
-        bind "Ctrl o" { SwitchToMode "Session"; }
-    }
-    shared_except "tab" "locked" {
-        bind "Ctrl t" { SwitchToMode "Tab"; }
-    }
-    shared_except "move" "locked" {
-        bind "Ctrl h" { SwitchToMode "Move"; }
-    }
-    shared_except "tmux" "locked" {
-        bind "Ctrl b" { SwitchToMode "Tmux"; }
-    }
-}
-
-plugins {
-    tab-bar { path "tab-bar"; }
-    status-bar { path "status-bar"; }
-    strider { path "strider"; }
-    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
-// Options:
-//   - detach (Default)
-//   - quit
-//
-// on_force_close "quit"
-
-//  Send a request for a simplified ui (without arrow fonts) to plugins
-//  Options:
-//    - true
-//    - false (Default)
-//
-// simplified_ui true
-
-// Choose the path to the default shell that zellij will use for opening new panes
-// Default: $SHELL
-//
-// default_shell "fish"
-
-// Toggle between having pane frames around the panes
-// Options:
-//   - true (default)
-//   - false
-//
-// pane_frames true
-
-// Define color themes for Zellij
-// For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes
-// Once these themes are defined, one of them should to be selected in the "theme" section of this file
-//
-// themes {
-//     dracula {
-//         fg 248 248 242
-//         bg 40 42 54
-//         red 255 85 85
-//         green 80 250 123
-//         yellow 241 250 140
-//         blue 98 114 164
-//         magenta 255 121 198
-//         orange 255 184 108
-//         cyan 139 233 253
-//         black 0 0 0
-//         white 255 255 255
-//     }
-// }
-
-// themes {
-//     bogster-dark {
-//         bg "#161C23"
-//         fg "#C6B8AD"
-//         black "#161C23"
-//         red "#D32C5D"
-//         green "#57A331"
-//         orange "#DC7759"
-//         yellow "#DCB659"
-//         blue "#36B2D4"
-//         magenta "#B759DC"
-//         cyan "#23A580"
-//         white "#C6B8AD"
-//     }
-// }
-
 // Choose the theme that is specified in the themes section.
 // Default: default
-//
-// theme "default"
-
 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
-//
-// default_mode "locked"
-
-// Toggle enabling the mouse mode.
-// On certain configurations, or terminals this could
-// potentially interfere with copying text.
-// Options:
-//   - true (default)
-//   - false
-//
-// mouse_mode false
-
-// Configure the scroll back buffer size
-// This is the number of lines zellij stores for each pane in the scroll back
-// buffer. Excess number of lines are discarded in a FIFO fashion.
-// Valid values: positive integers
-// Default value: 10000
-//
-// scroll_buffer_size 10000
-
-// Provide a command to execute when copying text. The text will be piped to
-// the stdin of the program to perform the copy. This can be used with
-// terminal emulators which do not support the OSC 52 ANSI control sequence
-// that will be used by default if this option is not set.
-// Examples:
-//
-// copy_command "xclip -selection clipboard" // x11
-// copy_command "wl-copy"                    // wayland
-// copy_command "pbcopy"                     // osx
 
 // Choose the destination for copied text
 // Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
@@ -288,30 +12,10 @@ theme "{{zellij_theme}}"
 // Options:
 //   - system (default)
 //   - primary
-//
+copy_clipboard "primary"
-// copy_clipboard "primary"
 
-// Enable or disable automatic copy (and clear) of selection when releasing mouse
+// Toggle between having pane frames around the panes
-// Default: true
+// Options:
-//
+//   - true (default)
-// copy_on_select false
+//   - false
-
+pane_frames false
-// Path to the default editor to use to edit pane scrollbuffer
-// Default: $EDITOR or $VISUAL
-//
-// scrollback_editor "/usr/bin/vim"
-
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// Default: false
-//
-// mirror_session true
-
-// The folder in which Zellij will look for layouts
-//
-// layout_dir "/path/to/my/layout_dir"
-
-// The folder in which Zellij will look for themes
-//
-// theme_dir "/path/to/my/theme_dir"

zellij/layouts/project.kdl

@@ -1,87 +0,0 @@
-layout {
-    pane_template name="explorer" {
-        pane split_direction="vertical" {
-            pane size="14%" borderless=true command="zsh" {
-                args "-i" "-c" "exex"
-            }        
-            children
-        }
-    }
-
-    pane_template name="sidebar-pane" {
-        pane size="24%" split_direction="horizontal" { children; }
-    }
-
-    pane_template name="console-pane" {
-        pane size="28%" split_direction="vertical" { children; }
-    }
-
-    pane_template name="stacked-console-pane" {
-        pane size="28%" stacked=true { children; }
-    }
-
-    tab_template name="project-tab" {
-        pane size=1 borderless=true { plugin location="zellij:compact-bar"; }
-        children
-    }
-
-    default_tab_template {
-        pane size=1 borderless=true { plugin location="zellij:compact-bar"; }
-        explorer { pane focus=true; }
-    }
-
-    swap_tiled_layout name="ide" {
-        project-tab max_panes=3 {
-            explorer { pane; }
-        }
-        project-tab exact_panes=4 {
-            explorer { pane; }
-            console-pane split_direction="vertical" size="28%" { pane; }
-        }
-        project-tab exact_panes=5 {
-            explorer { pane; }
-            console-pane split_direction="vertical" size="28%" {
-                pane
-                pane
-            }
-        }
-        project-tab exact_panes=6 {
-            explorer { pane; }
-            stacked-console-pane stacked=true size="28%" {
-                pane
-                pane
-                pane
-            }
-        }
-        project-tab exact_panes=7 {
-            explorer split_direction="vertical" {
-                pane
-                sidebar-pane size="24%" { pane borderless=true; }
-            }
-            stacked-console-pane stacked=true size="28%" {
-                pane
-                pane
-                pane
-            }
-        }
-        project-tab min_panes=8 {
-            explorer {
-                pane split_direction="vertical" {
-                    pane
-                    pane
-                    pane
-                }
-                pane split_direction="vertical" {
-                    pane
-                    pane
-                    pane
-                }
-                pane split_direction="vertical" {
-                    pane
-                    pane
-                    pane
-                }
-            }
-        }
-    }
-}

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,32 +1,34 @@
 # zellij
 if (( $+commands[zellij] )); then
-  ZELLIJ_AUTO_ATTACH=true
+  # Uncomment to start/exit zellij automatically
-  eval "$(zellij setup --generate-auto-start zsh)"
+  # ZELLIJ_AUTO_ATTACH=true
-
+  # ZELLIJ_AUTO_EXIT=true
+  # eval "$(zellij setup --generate-auto-start zsh)"
 
   if (( $+commands[sk] )); then
-    za() {
+    function za {
       local zj_sessions=$(zellij list-sessions -ns)
       local no_sessions=$(echo "${zj_sessions}" | wc -l)
 
       if [ "${no_sessions}" -ge 2 ]; then
-          zellij attach \
+        zellij attach \
-          "$(echo "${zj_sessions}" | sk)"
+        "$(echo "${zj_sessions}" | sk)"
       else
-         zellij attach -c
+        zellij attach -c
       fi
     }
   fi
 
-  ide() {
+  # Name tabs after current working directory
-    local layout="${ZELLIJ_LAYOUT:-${HOME}/.config/zellij/layouts/project.kdl}"
+  if [[ -v ZELLIJ ]]; then
-    local name="${PROJECT_NAME:-/}"
+    function zrt {
+      zellij action rename-tab "${PWD##*/}"
+    }
 
-    if (( ${+ZELLIJ} )); then
+    function znt {
-      # FIXME: https://github.com/zellij-org/zellij/issues/2299
+      zellij action new-tab
-      zellij action new-tab --layout "${layout}" --cwd "${PWD}" --name "${name}"
+    }
-    else
+
-      zellij --layout "${layout}" --session "${name}"
+    chpwd_functions+=( zrt )
-    fi
+  fi
-  }
 fi

zshenv.zsh

@@ -1,12 +1,18 @@
-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"
+if (( $+commands[hx] )); then
+  export EDITOR="hx"
+  export VISUAL="hx"
+elif (( $+commands[helix] )); then
+  export EDITOR="helix"
+  export VISUAL="helix"
+fi
+
 export FINDER="sk"
 export GPG_TTY=$(tty)
-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"
 
 fpath+=(~/.zsh/completions)