From 32c73963b2adbdf0d499fa1db580b411dfec581c Mon Sep 17 00:00:00 2001 From: John Mertz Date: Tue, 9 May 2023 15:29:44 -0400 Subject: [PATCH] Only host uses flatpak of NeoVim --- bash/bashrc | 3 --- bash/bashrc.distrobox | 3 +++ bash/bashrc.host | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bash/bashrc b/bash/bashrc index 6566f2607..7f7f45233 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -16,9 +16,6 @@ if [ "$(tty)" == '/dev/tty1' ] && [ ! "$SSH_TTY" ]; then fi fi -# Setup editor -export EDITOR="flatpak run io.neovim.nvim" - # don't put duplicate lines or lines starting with space in the history. shopt -s histappend HISTCONTROL=ignoreboth diff --git a/bash/bashrc.distrobox b/bash/bashrc.distrobox index 2ae2754ff..d094c178a 100644 --- a/bash/bashrc.distrobox +++ b/bash/bashrc.distrobox @@ -1,5 +1,8 @@ # vim: ft=sh +# Setup editor +export EDITOR="nvim" + export DISTROBOX=$(grep -oP "(?<=name=\")[^\";]+" /run/.containerenv) export SSH_AUTH_SOCK="$HOME/.spool/ssh-agent.sock" HISTFILE="${HISTFILE}.$DISTROBOX" diff --git a/bash/bashrc.host b/bash/bashrc.host index 9eeb9f536..736360d03 100644 --- a/bash/bashrc.host +++ b/bash/bashrc.host @@ -1,5 +1,8 @@ # vim: ft=sh +# Setup editor +export EDITOR="flatpak run io.neovim.nvim" + export SSH_AUTH_SOCK="$HOME/.spool/ssh-agent.sock" if [ -z "$SSH_AGENT_PID" ]; then if [ -f "$HOME/.spool/ssh-agent.env" ]; then