From e733d4cce00947551e70f5ab2858f22ded7b8612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakob@schuerz.at>
Date: Fri, 20 Jan 2023 21:51:12 +0100
Subject: [PATCH] move and introduce new defaults

---
 bashrc_add           | 4 ++--
 defaults.conf        | 3 +++
 defaults.conf.sample | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bashrc_add b/bashrc_add
index 033fb7d..ef0f27b 100755
--- a/bashrc_add
+++ b/bashrc_add
@@ -76,8 +76,8 @@ if [[ $- = *i* ]] ; then
     [ -z "${P11M:+x}" ]                      && [ -n "$(whereis p11-kit-proxy.so|awk '{print $2}')" ] && export P11M=$(whereis p11-kit-proxy.so|awk '{print $2}' || { echo "p11-kit-proxy not forwarded by ssh or installed, unset P11M"; unset P11M; })
 
     # Basics
-    [ -z "${VISUAL+x}" ]    && export VISUAL=vim
-    [ -z "${EDITOR+x}" ]    && export EDITOR=vim
+    [ -z "${VISUAL+x}" ]    && export VISUAL=${VISUAL_DEFAULT}
+    [ -z "${EDITOR+x}" ]    && export EDITOR=${EDITOR_DEFAULT}
 
     cat << EOF >> "${MSC_LOGFILE}"
 ==8<=== start configure new shell ============== $(date) ===============8<==
diff --git a/defaults.conf b/defaults.conf
index 21b59cd..083299c 100644
--- a/defaults.conf
+++ b/defaults.conf
@@ -30,3 +30,6 @@ export TRASHMAIL_HASHED_DEFAULT=true
 
 export SSH_CERT_VALIDITY_WARN_SEC="14 days"
 
+### OTHER STUFF ###
+VISUAL_DEFAUTL=vim
+EDITOR_DEFAULT=vim
diff --git a/defaults.conf.sample b/defaults.conf.sample
index cc68734..8c468d8 100644
--- a/defaults.conf.sample
+++ b/defaults.conf.sample
@@ -29,3 +29,7 @@ export TRASHMAIL_TARGET_MAIL_DEFAULT=user@example.com
 export TRASHMAIL_HASHED_DEFAULT=true
 
 export SSH_CERT_VALIDITY_WARN_SEC="14 days"
+
+### OTHER STUFF ###
+VISUAL_DEFAUTL=vim
+EDITOR_DEFAULT=vim