daniel/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: daniel:b5378724daeeb76a4f05d5960f46c49fbf5e4656
Branches Tags
daniel:main
daniel:yazi
..
compare: daniel:bb86ce0a8a2843f68eb88664469ee303f3ec5f3e
Branches Tags
daniel:main
daniel:yazi

5 Commits
b5378724da ... bb86ce0a8a

Author SHA1 Message Date
Daniel Lynn
bb86ce0a8a
Do not autostart/attach zellij 2025-04-16 14:56:26 -05:00
Daniel Lynn
a5fb58fc53
Use standard helix command for envars 2025-04-16 14:56:15 -05:00
Daniel Lynn
f9d9cfa453
Comment out boilerplate, use compact layout for zellij by default 2025-04-16 14:55:55 -05:00
Daniel Lynn
b5efca9e65
Catch helix or hx aliasing 2025-04-16 14:55:20 -05:00
Daniel Lynn
9431072374
Rebind lazygit for helix 2025-04-16 14:54:40 -05:00
5 changed files with 185 additions and 186 deletions
Show Stats Expand all files Collapse all files

2
aliases.d/helix.zsh
View File

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

6
helix/config.toml
View File

@ -28,7 +28,7 @@ C-R = ":config-reload"
_ = { n = ":set whitespace.render none", a = ":set whitespace.render all" } _ = { n = ":set whitespace.render none", a = ":set whitespace.render all" }
# Git integration with lazygit # Git integration with lazygit
C-g = [ A-g = [
":write-all", ":write-all",
":insert-output lazygit >/dev/tty", ":insert-output lazygit >/dev/tty",
":redraw", ":redraw",
@ -53,8 +53,6 @@ e = [
":insert-output echo \"x1b[?1049h\" > /dev/tty", ":insert-output echo \"x1b[?1049h\" > /dev/tty",
":open %sh{cat /tmp/unique-file-c5140c67}", ":open %sh{cat /tmp/unique-file-c5140c67}",
":redraw", ":redraw",
":set mouse false",
":set mouse true",
] ]
E = [ E = [
":sh rm -f /tmp/unique-file-bea21125", ":sh rm -f /tmp/unique-file-bea21125",
@ -62,6 +60,4 @@ E = [
":insert-output echo \"x1b[?1049h\" > /dev/tty", ":insert-output echo \"x1b[?1049h\" > /dev/tty",
":open %sh{cat /tmp/unique-file-bea21125}", ":open %sh{cat /tmp/unique-file-bea21125}",
":redraw", ":redraw",
":set mouse false",
":set mouse true",
] ]

350
zellij/config.kdl
View File

@ -1,179 +1,179 @@
// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true" // 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 "Alt 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 // Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
// eg. when terminal window with an active zellij session is closed // 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 // The name of the default layout to load on startup
// Default: "default" // Default: "default"
// //
// default_layout "compact" default_layout "compact"
// Choose the mode that zellij uses when starting up. // Choose the mode that zellij uses when starting up.
// Default: normal // Default: normal

6
zsh.d/zellij.zsh
View File

@ -1,8 +1,8 @@
# zellij # zellij
if (( $+commands[zellij] )); then 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 if (( $+commands[sk] )); then
za() { za() {

7
zshenv.zsh
View File

@ -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 FINDER="sk"
export GPG_TTY=$(tty) 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 NVM_DIR="$HOME/.nvm"
export SKIM_DEFAULT_COMMAND="git ls-tree -r --name-only HEAD || rg --files" export SKIM_DEFAULT_COMMAND="git ls-tree -r --name-only HEAD || rg --files"
export VISUAL="helix" export VISUAL="hx"
fpath+=(~/.zsh/completions) fpath+=(~/.zsh/completions)