Merged zsh_aliases and bash_aliases into single aliases, extracted

functions from aliases config file to separate functions config file

bash/.bashrc

@@ -52,9 +52,12 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
-if [ -f ~/.bash_aliases ]; then
-    source ~/.bash_aliases
-fi
+for config_file in $HOME/.{aliases,functions}; do
+    if [[ -r "$config_file" ]] && [[ -f "$config_file" ]]; then
+		source "$config_file"
+	fi
+done
+unset config_file
 
 if ! shopt -oq posix; then
 	if [[ -f /usr/share/bash-completion/bash_completion ]]; then

bash/.bash_aliases → bash_and_zsh/.aliases

@@ -1,5 +1,11 @@
-# alias ls='ls --color=auto'
-alias ls='eza --group-directories-first --git --color=always'
+alias ls='ls --color=auto'
+
+# Uncomment for eza on server
+# alias ls='eza --group-directories-first --git --color=always'
+
+# Uncomment for eza on workstation with nerd fonts
+# alias ls='eza --group-directories-first --icons=always --git --color=always'
+
 alias l='ls --oneline'
 alias la='ls -a'
 alias ll='ls -lh'
@@ -18,8 +24,8 @@ alias clshist='truncate -s 0 $HISTFILE && reset'
 alias ip='ip -color=auto'
 alias diff='diff --color=auto'
 alias grep='grep --color=auto'
-alias egrep='grep -E --color=auto'
-alias fgrep='grep -F --color=auto'
+alias egrep='grep -E'
+alias fgrep='grep -F'
 alias less='less -R -s -M +Gg'
 alias dmesg='dmesg --color=always'
 alias mkdir='mkdir -p'
@@ -45,9 +51,14 @@ alias free='free -h'
 alias wget='wget -c'
 alias myexternalip='dig +short myip.opendns.com @resolver1.opendns.com'
 alias catwithoutcomments='grep -v "^$\|^#"'
-alias sudovim='sudo -E vim'
 alias checkcommand='type -t'
 alias pipenv-run='pipenv run python'
+alias htb='cd /opt/htb'
+alias codeby='cd /opt/codeby'
+alias go-codeby='wg-quick up NordeN'
+alias empire-server='docker start empire & docker attach empire'
+alias empire-client='docker exec -it empire ./ps-empire client'
+alias hosts='sudo vim /etc/hosts'
 
 alias ..='cd ..'
 alias ...='cd ../..'
@@ -57,8 +68,3 @@ alias ......='cd ../../../../..'
 alias .......='cd ../../../../../..'
 alias ........='cd ../../../../../../..'
 
-ctlstartandstat ()
-{
-	systemctl start "$1"
-    systemctl status "$1"
-}

bash_and_zsh/.functions

@@ -0,0 +1,8 @@
+function ctlstartandstat () {
+	systemctl start "$1"
+    systemctl status "$1"
+}
+
+function sudovim() {
+	sudo -E vim $1
+}

zsh/.zshrc

@@ -76,12 +76,13 @@ plugins=(
 )
 
 source $ZSH/oh-my-zsh.sh
-for config_file in $HOME/.{zsh_aliases,zsh_functions}; do
+
+for config_file in $HOME/.{aliases,functions}; do
     if [[ -r "$config_file" ]] && [[ -f "$config_file" ]]; then
 		source "$config_file"
 	fi
 done
-unset file
+unset config_file
 
 # Настройки автодополнения zsh
 zstyle ':completion:*' special-dirs false