From ccb866bb586286d26b7a71075656fb64b113b3cd Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 16 May 2025 20:41:44 -0700 Subject: [PATCH] Fix gitsigns lua configuration --- .bashrc | 22 ++++++++++++++++++---- nvim/lua/plugins/gitsigns.lua | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.bashrc b/.bashrc index 64fe8a8..7bf0b99 100644 --- a/.bashrc +++ b/.bashrc @@ -1,6 +1,4 @@ # ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples # If not running interactively, don't do anything case $- in @@ -9,7 +7,6 @@ case $- in esac # don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options HISTCONTROL=ignoreboth # append to the history file, don't overwrite it @@ -158,8 +155,12 @@ fi # Custom dircolors [ -f ~/.dircolors ] && eval "$(dircolors ~/.dircolors)" +# Set nvim as the preferred editor if available +if [ $(which nvim) ]; then + export EDITOR=nvim +fi + # Kubernetes -export EDITOR=nano alias k9=k9s which kubectl 1> /dev/null && source <(kubectl completion bash) which helm 1> /dev/null && source <(helm completion bash) @@ -183,3 +184,16 @@ PROMPT_COMMAND="${PROMPT_COMMAND};history -a" # Funciton to notify after a long-running command alias bell="echo -e '\a'" +# Apply local .bashrc to remote ssh session +ssh-custom() { + remote_file=$(mktemp) + if $(ssh "$@" "cat > ${remote_file}" < ~/.bashrc > /dev/null 2>&1); then + # Successfully copied bashrc to the remote. Source it upon ssh + ssh -t "$@" "bash --rcfile ${remote_file}; rm ${remote_file}" + else + # SSH Config specifies a RemoteCommand; connect normally + ssh "$@" + fi +} +alias sssh=ssh-custom + diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua index 7cbe57e..0163970 100644 --- a/nvim/lua/plugins/gitsigns.lua +++ b/nvim/lua/plugins/gitsigns.lua @@ -1,6 +1,6 @@ return { "lewis6991/gitsigns.nvim", - --branch="v1.0.2", + tag="v1.0.2", config = function() require("gitsigns").setup({}) end,