From 78c15fbd2861c07b7f503b9e5afaf8f0db322e81 Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gar.dev>
Date: Mon, 4 Mar 2024 22:54:39 +0200
Subject: [PATCH] switch to .local for consistency

---
 .bash_aliases | 4 ++--
 .bashrc       | 4 ++--
 .gitconfig    | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 3cde8d9..eed189f 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -57,6 +57,6 @@ alias yda="youtube-dl -x --audio-format mp3"
 ##### Mac OS Specific #####
 alias fl="open -a ForkLift"
 
-if [ -f ~/.bash_local_aliases ]; then
-    . ~/.bash_local_aliases
+if [ -f ~/.bash_aliases.local ]; then
+    . ~/.bash_aliases.local
 fi
diff --git a/.bashrc b/.bashrc
index bde8400..8d2f5d0 100644
--- a/.bashrc
+++ b/.bashrc
@@ -71,8 +71,8 @@ if [ -f ~/.bash_aliases ]; then
   source ~/.bash_aliases
 fi
 
-if [ -f ~/.bashrc_local ]; then
-  source ~/.bashrc_local
+if [ -f ~/.bashrc.local ]; then
+  source ~/.bashrc.local
 fi
 
 # bash-git prompt
diff --git a/.gitconfig b/.gitconfig
index c802713..14c9cf2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,10 +1,12 @@
-
+# local user config, usernames, etc
+[include]
+    path=~/.gitconfig.local
 [color]
     diff = auto
     status = auto
     branch = auto
     interactive = auto
-    ui = auto
+    ui = true
 [alias]
     # Shorten some often used commands
     b = branch
@@ -47,6 +49,3 @@
 	clean = git media clean %f
 	smudge = git media smudge %f
 	required = true
-# local user config, usernames, etc
-[include]
-    path=~/.gitconfig-local