rb

.bash_aliases

@@ -1,29 +1,19 @@
 export CONFIG_DIR="$HOME/.dotfiles"
 
-# ╦═╗┌─┐┌─┐┬─┐┌─┐┌─┐┬ ┬
-# ╠╦╝├┤ ├┤ ├┬┘├┤ └─┐├─┤
-# ╩╚═└─┘└  ┴└─└─┘└─┘┴ ┴
-
+# Refresh
 if [ -z "${ZSH}" ]; then
   alias refresh=". $HOME/.bashrc"
 else
   alias refresh=". $HOME/.zshrc"
 fi
 
-# ╦┌┐┌┌─┐┌┬┐┌─┐┬  ┬
-# ║│││└─┐ │ ├─┤│  │
-# ╩┘└┘└─┘ ┴ ┴ ┴┴─┘┴─┘
-
-alias install_cli="$CONFIG_DIR/auto-config-cli.sh"
-alias install_gui="$CONFIG_DIR/auto-config.sh"
-
-# ╔╦╗╦╔═╗╔═╗
-# ║║║║╚═╗║
-# ╩ ╩╩╚═╝╚═╝
-
 # Nautilus
 alias open="nautilus ."
 
+# Install scripts
+alias install_cli="$CONFIG_DIR/auto-config-cli.sh"
+alias install_gui="$CONFIG_DIR/auto-config.sh"
+
 # Go to config directory
 alias config="cd $CONFIG_DIR"
 
@@ -62,18 +52,12 @@ function s_clean {
   s_on
 }
 
-# Make
-alias mk='make -j5'
-alias mec='make'
-alias mecque='make'
-
 # VPN
 alias vpn="sudo openvpn --config $HOME/Nextcloud/#\ -\ Configs/rguiheneuf.ovpn"
 
 # ╔═╗┬┌┬┐  ╔═╗┬  ┬┌─┐┌─┐┌─┐┌─┐
 # ║ ╦│ │   ╠═╣│  │├─┤└─┐├┤ └─┐
 # ╚═╝┴ ┴   ╩ ╩┴─┘┴┴ ┴└─┘└─┘└─┘
-
 alias gs='git status'
 alias gc='git checkout'
 alias gcm='git checkout master'
@@ -107,7 +91,7 @@ function branch_create {
   git push -u origin $1
 }
 
-# Tag helpers
+# Tag
 function tag_create {
   git tag $1
   git push origin $1
@@ -129,9 +113,8 @@ function g_save {
 # ╔═╗┬┌┬┐  ╦═╗┌─┐┌┐ ┌─┐┌─┐┌─┐
 # ║ ╦│ │   ╠╦╝├┤ ├┴┐├─┤└─┐├┤
 # ╚═╝┴ ┴   ╩╚═└─┘└─┘┴ ┴└─┘└─┘
-
 function grb {
-  git rebase --interactive HEAD~$1
+  git rebase -i HEAD~$1
 }
 
 function grbi {
@@ -174,14 +157,12 @@ function gai {
 # ╔═╗┬┌┬┐  ╔═╗┌┬┐┌─┐┌┐┌┌┬┐
 # ║ ╦│ │   ╠═╣│││├┤ │││ ││
 # ╚═╝┴ ┴   ╩ ╩┴ ┴└─┘┘└┘─┴┘
-
 alias amend_pro="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF <rguiheneuf@netatmo.com>\"' $1"
 alias amend_perso="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf <robin-charles@hotmail.fr>\"' $1"
 
 # ╦═╗┌─┐┌─┐┌─┐┌─┐┬┌┬┐┌─┐┬─┐┬┌─┐┌─┐
 # ╠╦╝├┤ ├─┘│ │└─┐│ │ │ │├┬┘│├┤ └─┐
 # ╩╚═└─┘┴  └─┘└─┘┴ ┴ └─┘┴└─┴└─┘└─┘
-
 alias bc='cd $HOME/Netatmo/embedded/firmware-bitcloud'
 alias fw='cd $HOME/Netatmo/embedded/firmware'
 alias nmr='cd $HOME/Netatmo/embedded/nmr'
@@ -207,10 +188,6 @@ function ssh_keygen {
   cd -
 }
 
-# ╔╗╔┌─┐┌┬┐┌─┐┌┬┐┌┬┐┌─┐
-# ║║║├┤  │ ├─┤ │ ││││ │
-# ╝╚╝└─┘ ┴ ┴ ┴ ┴ ┴ ┴└─┘
-
 # Flash sniffer nRF52
 function nrf52 {
   arm-none-eabi-objcopy -O ihex output/nrf52840/bin/$1 $1.hex
@@ -224,6 +201,11 @@ function nrf52 {
   fi
 }
 
+# Make
+alias mk='make -j5'
+alias mec='make'
+alias mecque='make'
+
 # app.S
 function generate_objdump {
   arm-none-eabi-objdump -S $1.elf > app.S
@@ -240,10 +222,6 @@ alias py_wireshark='$HOME/Netatmo/core/python-emb-tools/python/bin/zigbee/python
 alias stflash='sudo stm32_sbm -f app.bin -s 0x1000 -d'
 alias stflash_dfu='stm32_dfu -f app-jtag.bin -b'
 
-# ╔═╗┬┌┬┐  ╔═╗┬─┐┌─┐┌┬┐┌─┐┌┬┐
-# ║ ╦│ │   ╠═╝├┬┘│ ││││├─┘ │
-# ╚═╝┴ ┴   ╩  ┴└─└─┘┴ ┴┴   ┴
-
 # Git prompt
 if [ -z "${ZSH}" ]; then
   if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
@@ -259,7 +237,6 @@ fi
 # ╔═╗─┐ ┬┌─┐┌─┐┬─┐┌┬┐
 # ║╣ ┌┴┬┘├─┘│ │├┬┘ │
 # ╚═╝┴ └─┴  └─┘┴└─ ┴
-
 export PATH=$PATH:~/Netatmo/core/embedded-tools/Linux/flasher
 export PATH=$PATH:~/Netatmo/core/generic-embedded/stm32_sbm
 export PATH=$PATH:~/Netatmo/core/generic-embedded/stm32_dfu