From e0104c26023ea619fe9c967c41eae3953caa30f3 Mon Sep 17 00:00:00 2001
From: Andre Ramnitz <tux.rising@gmail.com>
Date: Fri, 29 Dec 2023 03:34:29 +0100
Subject: [PATCH] bash/fish/kak: make config more robust

---
 config/fish/fish_variables     | 2 ++
 config/fish/functions/gs.fish  | 3 ---
 config/fish/functions/gst.fish | 3 +++
 config/kak/kakrc               | 2 +-
 home/.bashrc                   | 4 +++-
 5 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100644 config/fish/functions/gs.fish
 create mode 100644 config/fish/functions/gst.fish

diff --git a/config/fish/fish_variables b/config/fish/fish_variables
index 10efd7b3..509f25c7 100644
--- a/config/fish/fish_variables
+++ b/config/fish/fish_variables
@@ -1,6 +1,8 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export EDITOR:kks\x20edit
+SETUVAR --export VISUAL:kks\x20edit
+SETUVAR --export PAGER:bat\x20--style\x20auto
 SETUVAR --export FZF_DEFAULT_OPTS:--multi\x20--layout=reverse\x20--preview-window=down:60%
 SETUVAR --export KCR_DEFAULT_SESSION:default
 SETUVAR --export VDPAU_DRIVER:radeonsi
diff --git a/config/fish/functions/gs.fish b/config/fish/functions/gs.fish
deleted file mode 100644
index 0755f7c4..00000000
--- a/config/fish/functions/gs.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gs --wraps='git status' --description 'alias gs=git status'
-  git status $argv; 
-end
diff --git a/config/fish/functions/gst.fish b/config/fish/functions/gst.fish
new file mode 100644
index 00000000..0555d058
--- /dev/null
+++ b/config/fish/functions/gst.fish
@@ -0,0 +1,3 @@
+function gst --wraps='git status' --description 'alias gst=git status'
+  git status $argv; 
+end
diff --git a/config/kak/kakrc b/config/kak/kakrc
index 33fc27a3..715f9e4c 100644
--- a/config/kak/kakrc
+++ b/config/kak/kakrc
@@ -9,6 +9,7 @@ hook global NormalKey y %{ nop %sh{
 # ──────────────────────────────────────────────────────────────────────────────
 hook global BufOpenFile .* %{
     modeline-parse
+    editorconfig-load
 }
 
 hook global BufCreate [^*].* %{
@@ -22,7 +23,6 @@ hook global BufCreate [^*].* %{
 # dynamic scrolloff
 # ──────────────────────────────────────────────────────────────────────────────
 hook global WinCreate [^*].* %{
-    editorconfig-load
     hook -once window WinDisplay .* %{
         hook window WinResize [0-9]*\.[0-9]* %{
             set-option window scrolloff %sh{
diff --git a/home/.bashrc b/home/.bashrc
index eda3817e..682fc798 100644
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -11,15 +11,17 @@ export PATH="$PATH:~/go/bin:~/.cargo/bin:~/.local/bin:~/Applications/"
 
 export BROWSER='qutebrowser "--untrusted-args %u"'
 export EDITOR="kks edit"
+export VISUAL="kks edit"
 export KKS_DEFAULT_SESSION='default'
 export KKS_USE_GITDIR_SESSIONS=1
-export PAGER="bat"
+export PAGER="bat --style auto"
 export VDPAU_DRIVER="radeonsi"
 export XZ_OPT="--threads=16"
 
 alias grep='grep -i'
 alias gcp="git cherry-pick"
 alias glo="git log --oneline"
+alias gst="git status"
 alias nano='nano -_qpT4 '
 alias free='free -h --si'
 
-- 
2.51.2