From 6f75310b713ce70dbe57c6bffd38b35b84886daa Mon Sep 17 00:00:00 2001 From: codepuncher Date: Wed, 4 Feb 2026 12:37:55 +0000 Subject: [PATCH] git,nvim,zsh,tmux updates --- git/gitconfig | 3 +++ git/users/wsl.gitconfig | 14 ++++++++--- nvim/lua/keymappings.lua | 2 +- nvim/lua/plugins/configs/telescope.lua | 2 ++ nvim/lua/plugins/configs/trouble.lua | 12 +++++++--- setup.sh | 1 + shell/functions | 18 +++++++------- shell/spaceship.zsh | 26 ++++++++++++++++++++ shell/zshrc | 33 +++++--------------------- tmux/tmux.conf | 2 ++ 10 files changed, 70 insertions(+), 43 deletions(-) create mode 100644 shell/spaceship.zsh diff --git a/git/gitconfig b/git/gitconfig index 4e84c28..375f511 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -52,5 +52,8 @@ [includeIf "gitdir:/home/itineris/"] path = ~/.dotfiles/git/users/wsl.gitconfig +[includeIf "gitdir:/tmp/"] + path = ~/.dotfiles/git/users/wsl.gitconfig + [includeIf "gitdir:/home/work/"] path = ~/.dotfiles/git/users/work.gitconfig diff --git a/git/users/wsl.gitconfig b/git/users/wsl.gitconfig index a23f3cf..ff70899 100644 --- a/git/users/wsl.gitconfig +++ b/git/users/wsl.gitconfig @@ -1,9 +1,17 @@ [user] - signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6lhgN8pvPgXJpgr8e4vo6k0nwP4mI8zgQcYMvePPBCNy8zZHS9BTKHPy/EdwNrCKX87uv0HcJeIztCShfmu7OjvasO6zgNzaNTOPxmelm7osBIuGYyZYih33ruT11eK8/RfeDh81OZGzMmez+Szk+oK1mb32rZvBPZpu2iGRFu0Yxx3jWtY+Kn8kwZX1GrfGEAfd29qoJiQli0Ma6YQhpioPgO7ybL8TCEvmkQPlCvHHpPhebwII8I2nZyGVpuIZsVleJW+fUroGOPDJ3xBcAs18YTMnQa/RDfUl0zsC6ZYa0MqnXUC6INBmNSk/hwLTmeVYDXau4DOLC8OpIaFkz + name = codepuncher + email = lee.hanbury@gmail.com + signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6lhgN8pvPgXJpgr8e4vo6k0nwP4mI8zgQcYMvePPBCNy8zZHS9BTKHPy/EdwNrCKX87uv0HcJeIztCShfmu7OjvasO6zgNzaNTOPxmelm7osBIuGYyZYih33ruT11eK8/RfeDh81OZGzMmez+Szk+oK1mb32rZvBPZpu2iGRFu0Yxx3jWtY+Kn8kwZX1GrfGEAfd29qoJiQli0Ma6YQhpioPgO7ybL8TCEvmkQPlCvHHpPhebwII8I2nZyGVpuIZsVleJW+fUroGOPDJ3xBcAs18YTMnQa/RDfUl0zsC6ZYa0MqnXUC6INBmNSk/hwLTmeVYDXau4DOLC8OpIaFkz [core] - pager = delta - sshCommand = ssh.exe + pager = delta + sshCommand = ssh.exe + +[gpg] + format = ssh + +[commit] + gpgsign = true [gpg "ssh"] program = "/mnt/c/Users/LeeHanbury-Pickett/AppData/Local/Microsoft/WindowsApps/op-ssh-sign-wsl.exe" diff --git a/nvim/lua/keymappings.lua b/nvim/lua/keymappings.lua index fb88cc8..db573ab 100644 --- a/nvim/lua/keymappings.lua +++ b/nvim/lua/keymappings.lua @@ -106,7 +106,7 @@ wk.add({ }, { 'ff', - "lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown({layout_config={width=0.5}}))", + "lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown({layout_config={width=100, height=0.75}}))", desc = '[TELESCOPE] Find files (ignore=true)', }, { 'fg', group = '[TELESCOPE] Git' }, diff --git a/nvim/lua/plugins/configs/telescope.lua b/nvim/lua/plugins/configs/telescope.lua index 1b9554d..24e4311 100644 --- a/nvim/lua/plugins/configs/telescope.lua +++ b/nvim/lua/plugins/configs/telescope.lua @@ -77,6 +77,8 @@ telescope.setup({ file_browser = { theme = 'ivy', depth = 3, + height = 0.9, + width = 0.9, }, }, }) diff --git a/nvim/lua/plugins/configs/trouble.lua b/nvim/lua/plugins/configs/trouble.lua index 8dbd641..fcccb6e 100644 --- a/nvim/lua/plugins/configs/trouble.lua +++ b/nvim/lua/plugins/configs/trouble.lua @@ -4,8 +4,14 @@ if not _plugin then end plugin.setup({ - auto_open = false, - auto_close = true, - auto_preview = false, mode = 'document_diagnostics', + modes = { + diagnostics = { + auto_open = true, + auto_close = true, + auto_preview = true, + auto_refresh = true, + focus = true, + }, + }, }) diff --git a/setup.sh b/setup.sh index f8e1b8b..733f58b 100755 --- a/setup.sh +++ b/setup.sh @@ -44,6 +44,7 @@ init_links() { move_link .config/tmux tmux move_link .config/nvim nvim move_link .gitconfig git/gitconfig + move_link .config/spacezhip.zsh shell/spacezhip.zsh move_link .config/alacritty/alacritty.toml terminals/alacritty.toml move_link .config/ghostty/config terminals/ghostty move_link .config/spotifyd/spotifyd.conf media/spotifyd.conf diff --git a/shell/functions b/shell/functions index 220503d..e5c9713 100644 --- a/shell/functions +++ b/shell/functions @@ -265,7 +265,7 @@ install_node_packages() { @ansible/ansible-language-server @fsouza/prettierd @tailwindcss/language-server - @volar/vue-language-server + @vue/language-server bash-language-server blade-formatter doctoc @@ -391,11 +391,11 @@ add_php_ppa() { add_gh_cli_ppa() { # shellcheck disable=SC2086,SC2002 - (type -p wget >/dev/null || (sudo apt update && sudo apt install wget -y)) \ - && sudo mkdir -p -m 755 /etc/apt/keyrings \ - && out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg \ - && cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ - && sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ - && sudo mkdir -p -m 755 /etc/apt/sources.list.d \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null - } + (type -p wget >/dev/null || (sudo apt update && sudo apt install wget -y)) && \ + sudo mkdir -p -m 755 /etc/apt/keyrings && \ + out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg && \ + cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg >/dev/null && \ + sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \ + sudo mkdir -p -m 755 /etc/apt/sources.list.d && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null +} diff --git a/shell/spaceship.zsh b/shell/spaceship.zsh new file mode 100644 index 0000000..2ea0a42 --- /dev/null +++ b/shell/spaceship.zsh @@ -0,0 +1,26 @@ +# See: https://github.com/spaceship-prompt/spaceship-prompt/issues/1193 +SPACESHIP_PROMPT_ASYNC=false + +SPACESHIP_PROMPT_ORDER=( + user # Username section + host # Hostname section + dir # Current directory section + git # Git section (git_branch + git_status) + php # PHP section + package # Package version + node # Node.js section + exec_time # Execution time + line_sep # Line break + vi_mode # Vi-mode indicator + jobs # Background jobs indicator + exit_code # Exit code section + char # Prompt character +) + +SPACESHIP_RPROMPT_ORDER=( + time # Time stampts section +) + +# Add a custom vi-mode section to the prompt +# See: https://github.com/spaceship-prompt/spaceship-vi-mode +spaceship add --before char vi_mode diff --git a/shell/zshrc b/shell/zshrc index 280cc54..cd81e15 100644 --- a/shell/zshrc +++ b/shell/zshrc @@ -88,34 +88,8 @@ zinit snippet OMZP::npm zinit snippet OMZP::composer # Theme -zinit light spaceship-prompt/spaceship-prompt zinit light spaceship-prompt/spaceship-vi-mode - -# Spaceship Prompt -SPACESHIP_TIME_SHOW=true -SPACESHIP_PROMPT_ORDER=( - user # Username section - dir # Current directory section - host # Hostname section - git # Git section (git_branch + git_status) - package # Package version - node # Node.js section - php # PHP section - venv # virtualenv section - exec_time # Execution time - line_sep # Line break - battery # Battery level and status - # vi_mode # Vi-mode indicator - jobs # Background jobs indicator - exit_code # Exit code section - char # Prompt character -) - -SPACESHIP_RPROMPT_ORDER=( - time # Time stampts section -) - -spaceship add --before char vi_mode +zinit light spaceship-prompt/spaceship-prompt # Setup history HISTFILE=~/.zsh_history @@ -195,8 +169,13 @@ bindkey -M vicmd 'k' history-substring-search-up bindkey -M vicmd 'j' history-substring-search-down # Misc +## Allow delete / export WORDCHARS=${WORDCHARS/\//} +## Allow delete to = +export WORDCHARS=${WORDCHARS/=/} +# Set editor to neovim export EDITOR="$(which nvim)" +# Do not record commands that start with a space to history setopt HIST_IGNORE_SPACE # Because WSL does not have diff --git a/tmux/tmux.conf b/tmux/tmux.conf index fec257f..f1c23c5 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -37,6 +37,8 @@ set-option -g status-position top # set -g automatic-rename-format '#(~/.dotfiles/bin/tmux_automatic_rename_format #{pane_current_path} #{pane_current_command})' ## Automatically renumber windows after closing a window # set -g renumber-windows on +## Creating +bind-key c new-window -a ## Splitting bind-key v split-window -h bind-key V split-window -h -c '#{pane_current_path}'