diff --git a/.config/helix/config.toml b/.config/helix/config.toml index ac27c91..69fb59d 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -95,7 +95,7 @@ Y = ":yank-diagnostic" f = "file_picker_in_current_buffer_directory" F = "file_picker_in_current_directory" e = "file_explorer_in_current_buffer_directory" -E = "file_explorer_in_current_working_directory" +E = "file_explorer_in_current_directory" s = "symbol_picker" S = "workspace_symbol_picker" g = "changed_file_picker" @@ -105,8 +105,6 @@ D = "workspace_diagnostics_picker" j = "jumplist_picker" ";" = "last_picker" - [keys.normal.z] h = "goto_line_start" l = "goto_line_end" - diff --git a/.config/mise/config.toml b/.config/mise/config.toml index a13d406..a2e62e9 100644 --- a/.config/mise/config.toml +++ b/.config/mise/config.toml @@ -4,7 +4,7 @@ elixir = "latest" elixir-ls = "latest" erlang = "latest" fwup = "latest" -go = "1.17" +go = "latest" neovim = "0.10.4" node = "latest" python = "latest" diff --git a/.config/zellij/config.kdl b/.config/zellij/config.kdl index 533fb55..4232389 100644 --- a/.config/zellij/config.kdl +++ b/.config/zellij/config.kdl @@ -1,7 +1,3 @@ -// -// THIS FILE WAS AUTOGENERATED BY ZELLIJ, THE PREVIOUS FILE AT THIS LOCATION WAS COPIED TO: /home/victor-martinez/.config/zellij/config.kdl.bak.1 -// - keybinds clear-defaults=true { locked { bind "Ctrl g" { SwitchToMode "normal"; } @@ -121,7 +117,7 @@ keybinds clear-defaults=true { } SwitchToMode "normal" } - bind "Ctrl o" { SwitchToMode "normal"; } + bind "Ctrl z" { SwitchToMode "normal"; } bind "p" { LaunchOrFocusPlugin "plugin-manager" { floating true @@ -154,7 +150,7 @@ keybinds clear-defaults=true { bind "Ctrl h" { SwitchToMode "move"; } } shared_except "locked" "session" { - bind "Ctrl o" { SwitchToMode "session"; } + bind "Ctrl z" { SwitchToMode "session"; } } shared_except "locked" "scroll" { bind "Alt left" { MoveFocusOrTab "left"; } @@ -166,9 +162,6 @@ keybinds clear-defaults=true { bind "Alt k" { MoveFocus "up"; } bind "Alt l" { MoveFocusOrTab "right"; } } - shared_except "locked" "scroll" "search" "tmux" { - bind "Ctrl b" { SwitchToMode "tmux"; } - } shared_except "locked" "scroll" "search" { bind "Ctrl s" { SwitchToMode "scroll"; } } @@ -187,9 +180,6 @@ keybinds clear-defaults=true { shared_except "normal" "locked" "entersearch" "renametab" "renamepane" { bind "esc" { SwitchToMode "normal"; } } - shared_among "pane" "tmux" { - bind "x" { CloseFocus; SwitchToMode "normal"; } - } shared_among "scroll" "search" { bind "PageDown" { PageScrollDown; } bind "PageUp" { PageScrollUp; } @@ -222,30 +212,6 @@ keybinds clear-defaults=true { renamepane { bind "esc" { UndoRenamePane; SwitchToMode "pane"; } } - shared_among "session" "tmux" { - bind "d" { Detach; } - } - tmux { - bind "left" { MoveFocus "left"; SwitchToMode "normal"; } - bind "down" { MoveFocus "down"; SwitchToMode "normal"; } - bind "up" { MoveFocus "up"; SwitchToMode "normal"; } - bind "right" { MoveFocus "right"; SwitchToMode "normal"; } - bind "space" { NextSwapLayout; } - bind "\"" { NewPane "down"; SwitchToMode "normal"; } - bind "%" { NewPane "right"; SwitchToMode "normal"; } - bind "," { SwitchToMode "renametab"; } - bind "[" { SwitchToMode "scroll"; } - bind "Ctrl b" { Write 2; SwitchToMode "normal"; } - bind "c" { NewTab; SwitchToMode "normal"; } - bind "h" { MoveFocus "left"; SwitchToMode "normal"; } - bind "j" { MoveFocus "down"; SwitchToMode "normal"; } - bind "k" { MoveFocus "up"; SwitchToMode "normal"; } - bind "l" { MoveFocus "right"; SwitchToMode "normal"; } - bind "n" { GoToNextTab; SwitchToMode "normal"; } - bind "o" { FocusNextPane; } - bind "p" { GoToPreviousTab; SwitchToMode "normal"; } - bind "z" { ToggleFocusFullscreen; SwitchToMode "normal"; } - } } // Plugin aliases - can be used to change the implementation of Zellij @@ -270,39 +236,19 @@ plugins { // Plugins to load in the background when a new session starts // eg. "file:/path/to/my-plugin.wasm" // eg. "https://example.com/my-plugin.wasm" -load_plugins { -} +load_plugins {} // Use a simplified UI without special fonts (arrow glyphs) -// Options: -// - true -// - false (Default) -// -// simplified_ui true +simplified_ui false // Choose the theme that is specified in the themes section. -// Default: default -// -// theme "dracula" +theme "catppuccin-mocha" -// Choose the base input mode of zellij. -// Default: normal -// default_mode "normal" -// Choose the path to the default shell that zellij will use for opening new panes -// Default: $SHELL -// -// default_shell "fish" +default_shell "zsh" -// Choose the path to override cwd that zellij will use for opening new panes -// -// default_cwd "/tmp" - -// The name of the default layout to load on startup -// Default: "default" -// -// default_layout "compact" +default_layout "compact" // The folder in which Zellij will look for layouts // (Requires restart) @@ -317,44 +263,23 @@ default_mode "normal" // Toggle enabling the mouse mode. // On certain configurations, or terminals this could // potentially interfere with copying text. -// Options: -// - true (default) -// - false -// -// mouse_mode false +mouse_mode false // Toggle having pane frames around the panes -// Options: -// - true (default, enabled) -// - false -// -// pane_frames false +pane_frames false // When attaching to an existing session with other users, // should the session be mirrored (true) // or should each user have their own cursor (false) -// (Requires restart) -// Default: false -// -// mirror_session true +mirror_session false -// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP -// eg. when terminal window with an active zellij session is closed -// (Requires restart) -// Options: -// - detach (Default) -// - quit -// -// on_force_close "quit" +on_force_close "quit" // 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. -// (Requires restart) // Valid values: positive integers -// Default value: 10000 -// -// scroll_buffer_size 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 @@ -371,96 +296,44 @@ default_mode "normal" // Choose the destination for copied text // Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard. // Does not apply when using copy_command. -// Options: -// - system (default) -// - primary -// -// copy_clipboard "primary" +copy_clipboard "system" // Enable automatic copying (and clearing) of selection when releasing mouse -// Default: true -// -// copy_on_select true +copy_on_select false // Path to the default editor to use to edit pane scrollbuffer -// Default: $EDITOR or $VISUAL -// scrollback_editor "/usr/bin/vim" +scrollback_editor "$EDITOR" -// A fixed name to always give the Zellij session. -// Consider also setting `attach_to_session true,` -// otherwise this will error if such a session exists. -// Default: -// -// session_name "My singleton session" +session_name "jaster" +attach_to_session true -// When `session_name` is provided, attaches to that session -// if it is already running or creates it otherwise. -// Default: false -// -// attach_to_session true - -// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible -// Options: -// - true (default) -// - false -// -// auto_layout false +auto_layout true // Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected -// Options: -// - true (default) -// - false -// -// session_serialization false - +session_serialization true // Whether pane viewports are serialized along with the session, default is false -// Options: -// - true -// - false (default) -// -// serialize_pane_viewport false - +serialize_pane_viewport false // Scrollback lines to serialize along with the pane viewport when serializing sessions, 0 // defaults to the scrollback size. If this number is higher than the scrollback size, it will // also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true. -// -// scrollback_lines_to_serialize 10000 +scrollback_lines_to_serialize 10000 // Enable or disable the rendering of styled and colored underlines (undercurl). // May need to be disabled for certain unsupported terminals -// (Requires restart) -// Default: true -// -// styled_underlines false +styled_underlines true // How often in seconds sessions are serialized -// -// serialization_interval 10000 +serialization_interval 10000 // Enable or disable writing of session metadata to disk (if disabled, other sessions might not know // metadata info on this session) -// (Requires restart) -// Default: false -// -// disable_session_metadata false - -// Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it) -// (Requires restart) -// Default: true (if the host terminal supports it) -// -// support_kitty_keyboard_protocol false - +disable_session_metadata false + // Whether to stack panes when resizing beyond a certain size -// Default: true -// -// stacked_resize false +stacked_resize true // Whether to show tips on startup -// Default: true -// show_startup_tips false // Whether to show release notes on first version run -// Default: true -// -// show_release_notes false +show_release_notes true diff --git a/.zshrc b/.zshrc index 5964086..3573240 100644 --- a/.zshrc +++ b/.zshrc @@ -5,6 +5,8 @@ export PATH=$HOME/.mix/escripts:$PATH export ZSH="$HOME/.oh-my-zsh" export CARGO_HOME=$HOME/.cargo/ +export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" + export VAULT_ADDR=https://vault.helloprima.com:8200 export PROJECTS_HOME=~/Documents/Prima @@ -69,3 +71,15 @@ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" [ -f "/home/victor-martinez/.ghcup/env" ] && . "/home/victor-martinez/.ghcup/env" # ghcup-env source <(jj util completion zsh) + +autoload -U +X bashcompinit && bashcompinit +complete -o nospace -C /home/linuxbrew/.linuxbrew/Cellar/vault/1.19.0/bin/vault vault + +fpath+=~/.zfunc +autoload -Uz compinit && compinit + +# bun completions +[ -s "/home/victor-martinez/.bun/_bun" ] && source "/home/victor-martinez/.bun/_bun" + +# Add zsh functions +fpath+=${ZDOTDIR:-~}/.zsh_functions