Merge branch 'master' of github.com:ChausseBenjamin/dotfiles

5 files changed, 10 insertions, 6 deletions

diff --git a/.config/aliasrc b/.config/aliasrc
index 63cdb91..959fee5 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -17,8 +17,10 @@ cdd,     cd ..
 e,       $EDITOR
 w,       $BROWSER
 g,       git
+ff,      fastfetch --raw $HOME/.cache/gentoo.six --logo-width 32 --logo-height 24 --logo-padding 2
 bi,      brew install
 gg,      go generate ./...
+gr,      groot=$(git rev-parse --show-toplevel 2>/dev/null); [ -z "$groot" ] || cd "$groot" || return
 mmi,     make clean && make && sudo make install
 R,       R -q
 tmcd,    tmux attach-session -t
diff --git a/.config/shortcutrc b/.config/shortcutrc
index 255b582..37e92d4 100644
--- a/.config/shortcutrc
+++ b/.config/shortcutrc
@@ -32,7 +32,7 @@ Downloads,   dl,  ~/Downloads
 Dropbox,     bx,  ~/Dropbox
 Hotkeys,     sx,  ~/.config/sxhkd
 Images,      img, ~/Dropbox/A/Personnal/Photos/unsorted
-Neovim,      vi,  ~/.config/nvim/lua/ben
+Neovim,      vi,  ~/.config/nvim
 OrgMode,     om,  ~/Dropbox/org
 School,      sf,  ~/Dropbox/A/scholar/sherbrooke/24-05-T2
 Scripts,     sc,  ~/.local/bin
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 383b94a..fef70e0 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -72,6 +72,8 @@ setopt prompt_subst
 PROMPT=" %B%F{blue}𝄞 %b%F{yellow}"
 RPROMPT="\$vcs_info_msg_0_ %B%F{magenta}(%B%F{cyan}%1/%B%F{magenta})"
 
+[ -z  "$SSH_CONNECTION" ] || PROMPT="$(whoami)@$(hostname)$PROMPT"
+
 zstyle ':vcs_info:git:*' formats '%b'
 
 # Quickly navigate to a created directory
@@ -94,9 +96,6 @@ f() {
 [ -f "${XDG_CACHE_HOME:-$HOME/.cache}/zsh-aliases" ] && source "${XDG_CACHE_HOME:-$HOME/.cache}/zsh-aliases"
 [ -f "${XDG_CACHE_HOME:-$HOME/.cache}/zsh-shortcuts" ] && source "${XDG_CACHE_HOME:-$HOME/.cache}/zsh-shortcuts"
 
-# Git Root
-alias gr='cd $(git rev-parse --show-cdup)'
-
 # Load zsh-syntax-highlighting; should be last.
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
 source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
diff --git a/.local/bin/aliasgen b/.local/bin/aliasgen
index 00fbc68..8f976d0 100755
--- a/.local/bin/aliasgen
+++ b/.local/bin/aliasgen
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Removing unecessary comments and documentation
-raw="$(sed 's/^\s*//;s/#.*$//;s/,\s*/,/g;/^$/d' <"$XDG_CONFIG_HOME/aliasrc")"
+raw="$(sed 's/^\s*//;s/#.*$//;s/,\s*/,/g;/^$/d' <"${XDG_CONFIG_HOME:-$HOME/.config}/aliasrc")"
 
 # #---zsh---# #
-echo "$raw" | sed 's/\(.*\),\(.*\)/alias \1="\2"/' >$HOME/.cache/zsh-aliases
+echo "$raw" | sed 's/\(.*\),\(.*\)/\1(){\2 $@}/' >"${XDG_CACHE_HOME:-$HOME/.cache}/zsh-aliases"
diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys
index a670df9..a1f9957 100644
--- a/.ssh/authorized_keys
+++ b/.ssh/authorized_keys
@@ -1,3 +1,6 @@
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDVXJbHCcGfpWGZgW59zWXm2yoEnMeiuwr+u7upBx98KRg26nlzlLjAXxRiKfHj+7V/Ybfhgr8N5XAT/IKY+eUQNZk8iKCHnvRpkJKB9+ZsVFR8Pjd/WOflguUIWY03/q0hYLv8x1RaoehAKL2kR8IIhj7fjlka/w+4C3nUyKV4Kf7NQfx8yTSbcf4bl0XVcpxtZWRlyrY8Y76DVRHOF6uI5FSxfd0E71T5Ew4alZWfQ+pC3+9g20dmSA1KdHKICijsZyyMLLDPH9iiZAqceOXjd0m+Bxq0Petc7cBxM/Ywgp9CSwvpDA27itf0+zsEihZsmMN5kd6Y5wng2yA5j2MzhhDvMAollSIEXnsjEpfLScYWN1+UmV2o/lqV/2gHxbqrmR4WCESAla5ivfvw6tjsLjOd75mN/lpwvpCg7mXUXivIb5dcPO0T2ou3ErD3T8oeEGEdyMw3lHFgUhe/cekdaxvd1OwudmtJF8G2KVkaZ4yd2nz4NYYvygmIpeM0SZ2p7Q3EfPQd530s+w/ya3wHQcRx6qGGrF/7i85ca1wc7rQEYAsOyh7WStaXsY6epK5ljM5JIgDyqpKAKK7AR3HR5xtFdl1kIo+G5/jHy/T5JUxwi3VdWc1g39cThlg2eyt1X/z1m7QZCX8wi90UL/2PksMXzCwiL5WVp9rSX1zuvQ== Generated By Termius
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCs3wHp2PmEDsWprpW5BQ+pM85thioouWfdEUHMZYo3H2HXT8orLfuxC9LO91bHsGVDzuMKYOVUc3IHi/q8XwtmrWSlJcomqYlwBNGe9h6YZu9ySI8D3SYcaWdP8wrq5mLahwG+OqhAQ5xJFU+kWI2huBxiIaL0iN/xkELuReHajEb1Uszx9EDAxE4r2xLijWmbIehDdhRTaLgJdcLca9vtaHxo928a20U77vb0J2fK7Miq25OKYpOEX6VsATGb0MLIIalnblxYjzcDF3XuCkyJn3r3uAt+xszrf+NIEA7FQJ16anxLhWQl0Oh1rAv+SUx0sOTGgDPeVNopmtghpHuikYMjReJRNZATQLFCF5iJ9S3tanMx6gYs9cFEUQItB+5nTYKGeIznz5wB2YhSuh43NbnUaxaDvAEmxZAOMKYPCUB5C3iJ9Zsf6nNvKj6V8wvxUrgIf4TU5etpaxEFrcOiJ2llE0gMddBNRj9mw4EfDD3XXIu1r7TwRY08ActDz4TbI5WA8nyc0q5nf9Q0UDz5y0jqbz4VgSeEij/gdAlJRVf4VytM+eYfWE3hv6kNnnPmTDQ2M0CatDFF61Pm70xx1v4QPtcJSjnXrJAmo376jou6x5KDO8BwF1uNzr5ihMDOkrbYKsETJ8pBCWdMuNSOKGKBIv+XV9wCnFinahoY3Q== master@workstation
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPrODGy6xVNK3f04AW0jVHMUSEKzs3SztAAQ8U1o9zuC5FLfrcuokaAuEjNoVZzskaoo4SNZh5sf+T4xM8vQcaqnuK5f3ZTzyab9HItyNrmNUO/Vata6zqgXrEDVVeAuNWXUtgPiUbrQwaPfdcpiekDw2Z1F8whupW5K5qvACjRC1e3b2Td+5d0Wow/6CmMcRHslJN4wtz01hALPrXpWbUegnMghL5XroeiqfKQkfGxGa0cO5cb+VlsgGpL6nRgLUljVsIjvWdbH0z1TaZJAGNan7FYhDNJNthkorRvnEBtMSmhKLg+mUCZgX4BOKhbYaGBNwkKQZxCqYIhggiGdgOtD9mORPUjL/009ooUqj59k37tiCJuLNoYUKnsShRJqurarOZjBVzqPfubA6AFGa/tlAmkmBhFEB0TcRNFF6ISYMABI6Gv79OFU/APoSXLsSdXs2ObeU57ruigTTKRJb5b0mFNSXjAUj7lYXDezB6wgT17bBXlofaPKf6lpSUBZwMR8scDIZsSqZO4PauVo9xhTwP7IKZhuIHotcMjWNwS9RwCXTUzaxlQLd3pP3eW2XksdmOa6gVIccArJNiF+NXGufR8LEOZt56OI4pZIEQ+SHLyKFADr3qy9uy6JipEinDCtWTkjzY06U0auz7nB+fb33SLhlQJoOytHV6F2ltww== master@battlestation
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkHCmxXhuojHcMCrEF/RTChBsrwCJVaJbzQc562tmmp7gINAIXh3xkIMvhtfyE65VOQO7nlKLfar1TeDOQ50Ywhun4CQvwnM2UjpeyQGhcrVx6KFyGuIOqABt/M48Cg2WQlQ92uGfYkTbPQ3MbGr8Nb4JPsXKHd9dVLRg/6H8fXDyNJUbkox1/GqHeOK04F0MvDucS25Tqk1avEM7RpbK45gMyePnDHmtEaJUfUDB03V9PMP4YSZa7V0Qugbuw6FpkKlQYyzUGyGcZ9YwgD0JR4vcu1nN7jdqQIJeERA0yeTvu7ySYU/S9ZgnflV4kmP3wWacxghmJzbgzlaKn7yvHWLLZhGf5ndbgxMycMKuZFpdaaqKtXZmD6pcIujou9ljQWP/MiDQZ/pY6jZM3W+rhUP0Y49mg98ag/DIjzhmOFCY9pnTQmm/ZfkYVwsMyzURX1YObVnO9DOSh+en7RQFEiWvYtKZ9j5hlh0Bd+uMTvV3rNEZ5gCoe91aRogH9OusRtnq6phoqBNvQUiwSIxnZ80ePUuVWocf1qstwAFDtH4yhceHQX0jyX1Z1FmE/ZfBvyScYdqb0JhkfYl39dHwEX6dCByrmQuylV2YM+sMMmjsL/Ericaan9MNo1PXEvv90WYq5YSyy+cwLABfeH/GIiz0g+hhpdIMVGtJ13mKv3Q== benjamin.chausse@goto.com
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCs3wHp2PmEDsWprpW5BQ+pM85thioouWfdEUHMZYo3H2HXT8orLfuxC9LO91bHsGVDzuMKYOVUc3IHi/q8XwtmrWSlJcomqYlwBNGe9h6YZu9ySI8D3SYcaWdP8wrq5mLahwG+OqhAQ5xJFU+kWI2huBxiIaL0iN/xkELuReHajEb1Uszx9EDAxE4r2xLijWmbIehDdhRTaLgJdcLca9vtaHxo928a20U77vb0J2fK7Miq25OKYpOEX6VsATGb0MLIIalnblxYjzcDF3XuCkyJn3r3uAt+xszrf+NIEA7FQJ16anxLhWQl0Oh1rAv+SUx0sOTGgDPeVNopmtghpHuikYMjReJRNZATQLFCF5iJ9S3tanMx6gYs9cFEUQItB+5nTYKGeIznz5wB2YhSuh43NbnUaxaDvAEmxZAOMKYPCUB5C3iJ9Zsf6nNvKj6V8wvxUrgIf4TU5etpaxEFrcOiJ2llE0gMddBNRj9mw4EfDD3XXIu1r7TwRY08ActDz4TbI5WA8nyc0q5nf9Q0UDz5y0jqbz4VgSeEij/gdAlJRVf4VytM+eYfWE3hv6kNnnPmTDQ2M0CatDFF61Pm70xx1v4QPtcJSjnXrJAmo376jou6x5KDO8BwF1uNzr5ihMDOkrbYKsETJ8pBCWdMuNSOKGKBIv+XV9wCnFinahoY3Q== master@workstation
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZiRJPJ8iXkSsYCzcWpk4O7ljaPhjn+0haPrJXVvYuOIJl6l/B4ovW7bBH9yxQ/v2/hVJni8X+MhGWuB7PmGpmUHoouCsAAZky4vPuYVvpbsBrIzjski3cBU8OA4/sqXG2C8/kz4q5EvLdb7+j0SBxtaV8r9nNXPG5nZOY4B35NafogEbKqKVT2lsdpJgVvk95XFhgvqAHd8/QmwY0f4uFJMCA+JlORfxmz89l8Xdy9YUXiJTno3knGXqd+7td4Cv2vshVZbiBCrRlyDidPWRIxbMopFXauqgA8g3xPlc+p0c+/yNcV+uyWvuD6OyxcpETyLsF5jEfarEVyhQ0tEVeJ2TF2uQtZw0RFJFMHQz0vWjiYeLwbfdaewjR3v6+qAClp5ZmKA8vC/J1cvcz+AZbfKqu81KIYO6m/uiAt3A94jc0qBegIa/jxNc8GGCMKwHqztkiBumete5Dg0SoijY7Aj6Tq62q3mzc+LaYsQ10LfNgYqZjWoabYlXyblI5k4nqV73gWGoHPUnra1OpQzdAaH5FwLtGg5fUMjIoRLgPEy5sQQSQEV9czjWmMa1hM8h+mNmT2GFdOGvsbRifg6ma81UbkfpoYIYrLYiBRgLra8/lGZTq5+fGDGp8D9FNud1nRaYyT4S++plo/Hot+5Ib9nVoJ5V+4HhDmpK5RiBq3Q== main@matierepremiere