From b72530e8f593ee5f2bf503b7e8af64a3fd88fbf9 Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gar.dev>
Date: Mon, 4 Mar 2024 23:40:50 +0200
Subject: [PATCH] Move and update aliases

---
 .bash_aliases  | 15 +++++++++++++--
 .bash_profile  | 11 +----------
 macos/Brewfile | 34 +++++++++++++++++-----------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index eed189f..4c30aea 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -2,6 +2,13 @@
 
 # Files
 alias df1="du -h -d 1"
+alias ls='ls -hG'
+alias ll='ls -alhFG'
+alias la='ls -AG'
+alias l='ls -CFG'
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
 
 # Git Aliases
 alias g="git"
@@ -45,8 +52,9 @@ alias vimrc="vim ~/.vimrc"
 # NPM
 alias npr="npm run"
 
-# CD-ing to some commonly used folders
-alias og="cd ~/Git"
+# IP addresses
+alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias localip="ipconfig getifaddr en0"
 
 alias grep="grep --color=auto"
 alias c="clear"
@@ -54,6 +62,9 @@ alias be="bundle exec"
 alias serve="python -m http.server 9000"
 alias yda="youtube-dl -x --audio-format mp3"
 
+# CD-ing to some commonly used folders
+alias og="cd ~/Git"
+
 ##### Mac OS Specific #####
 alias fl="open -a ForkLift"
 
diff --git a/.bash_profile b/.bash_profile
index 6d8cf7b..0b9f6bc 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -44,20 +44,11 @@ HISTCONTROL=ignoreboth
 # Aliases            #
 ######################
 
-# enable color support of ls and also add handy aliases
+# enable color support of ls
 if [ -x /usr/bin/dircolors ]; then
   test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-  alias grep='grep --color=auto'
-  alias fgrep='fgrep --color=auto'
-  alias egrep='egrep --color=auto'
 fi
 
-# some more ls aliases
-alias ls='ls -hG'
-alias ll='ls -alhFG'
-alias la='ls -AG'
-alias l='ls -CFG'
-
 # Editor
 export EDITOR='code -w'
 
diff --git a/macos/Brewfile b/macos/Brewfile
index 7841972..4c09bfa 100644
--- a/macos/Brewfile
+++ b/macos/Brewfile
@@ -1,20 +1,20 @@
 tap 'homebrew/bundle'
 
-brew 'youtube-dl'
-brew 'wget'
-brew 'tree'
-brew 'tmux'
-brew 'thefuck'
-brew 'nvm'
-brew 'jq'
-brew 'iperf3'
-brew 'htop'
-brew 'gnupg'
-brew 'git'
-brew 'gh'
-brew 'findutils'
-brew 'docker'
-brew 'coreutils'
-brew 'bitwarden-cli'
-brew 'bash-git-prompt'
 brew 'bash'
+brew 'bash-git-prompt'
+brew 'bitwarden-cli'
+brew 'coreutils'
+brew 'docker'
+brew 'findutils'
+brew 'gh'
+brew 'git'
+brew 'gnupg'
+brew 'htop'
+brew 'iperf3'
+brew 'jq'
+brew 'nvm'
+brew 'thefuck'
+brew 'tmux'
+brew 'tree'
+brew 'wget'
+brew 'youtube-dl'