From 85381436cf63e2070344da7d9cbe57e87a322f44 Mon Sep 17 00:00:00 2001
From: bretello <bretello@distruzione.org>
Date: Mon, 7 Feb 2022 20:49:25 +0100
Subject: [PATCH] zsh: cleanup aliases sourcing

---
 aliases.zsh        | 10 ----------
 brethil_dotfile.sh |  2 ++
 functions.zsh      |  5 -----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/aliases.zsh b/aliases.zsh
index 84bdd51..badbbb6 100755
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -88,13 +88,3 @@ alias dst='dvc status'
 alias dstc='dvc status --cloud'
 alias drp='dvc repro'
 alias drps='dvc repro -s'
-
-# dotfiles user aliases
-if [[ -f ~/.dotfiles_aliases ]]; then
-    source $HOME/.dotfiles_aliases
-fi
-
-# source ssh aliases
-if [[ -f $HOME/.ssh_aliases ]]; then
-    source $HOME/.ssh_aliases
-fi
diff --git a/brethil_dotfile.sh b/brethil_dotfile.sh
index 3a1b41b..f4693a7 100755
--- a/brethil_dotfile.sh
+++ b/brethil_dotfile.sh
@@ -94,6 +94,7 @@ source $DOTFILES/aliases.zsh
 # Extras
 functions_file=~/.dotfiles_functions
 aliases_file=~/.dotfiles_aliases
+ssh_file=~/.ssh_aliases
 
 ( # migration of old format
   if [[ -f ${functions_file}.sh ]]; then
@@ -109,6 +110,7 @@ aliases_file=~/.dotfiles_aliases
 # Source extras
 test -f "${functions_file}" && source "${functions_file}"
 test -f "${aliases_file}" && source "${aliases_file}"
+test -f "${ssh_file}" && source "${ssh_file}"
 
 ### SETUP PATHS ####
 export PATH=$PATH:$HOME/bin
diff --git a/functions.zsh b/functions.zsh
index 63a8d5c..ddad208 100755
--- a/functions.zsh
+++ b/functions.zsh
@@ -352,8 +352,3 @@ make_venv(){
     fi
 
 }
-
-# # dotfiles user functions
-# if [[ -f $HOME/.dotfiles_functions ]]; then
-#     source "$HOME/.dotfiles_functions"
-# fi