Compare commits

..

No commits in common. "ad6638144c0593bcd913f43d426981b1f2e71b02" and "52e029602c47846dc95aa0184e181b3a219af79e" have entirely different histories.

2 changed files with 6 additions and 6 deletions

View File

@ -243,8 +243,8 @@ function git_perso {
# ║ ╦│ │ ╠═╣│││├┤ │││ ││ # ║ ╦│ │ ╠═╣│││├┤ │││ ││
# ╚═╝┴ ┴ ╩ ╩┴ ┴└─┘┘└┘─┴┘ # ╚═╝┴ ┴ ╩ ╩┴ ┴└─┘┘└┘─┴┘
alias amend_pro="GIT_EDITOR=true git rebase --rebase-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF <rguiheneuf@netatmo.com>\"' $1" 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 --rebase-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf <robin-charles@hotmail.fr>\"' $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"
# ╦═╗┌─┐┌─┐┌─┐┌─┐┬┌┬┐┌─┐┬─┐┬┌─┐┌─┐ # ╦═╗┌─┐┌─┐┌─┐┌─┐┬┌┬┐┌─┐┬─┐┬┌─┐┌─┐
# ╠╦╝├┤ ├─┘│ │└─┐│ │ │ │├┬┘│├┤ └─┐ # ╠╦╝├┤ ├─┘│ │└─┐│ │ │ │├┬┘│├┤ └─┐
@ -285,7 +285,7 @@ function ssh_keygen {
# Flash sniffer nRF52 # Flash sniffer nRF52
function nrf52 { function nrf52 {
arm-none-eabi-objcopy -O ihex build/bin/$1 $1.hex arm-none-eabi-objcopy -O ihex output/nrf52840/bin/$1 $1.hex
nrfutil pkg generate --hw-version 52 --sd-req=0x00 --application $1.hex --application-version 1 $1.zip nrfutil pkg generate --hw-version 52 --sd-req=0x00 --application $1.hex --application-version 1 $1.zip
if [ -z "$2" ] if [ -z "$2" ]

View File

@ -16,9 +16,9 @@ fi
sudo apt install terminator codium fonts-firacode sudo apt install terminator codium fonts-firacode
mkdir -p $HOME/.config/Code/User/ mkdir -p $HOME/.config/VSCodium/User/
ln -sf $HOME/.dotfiles/codium/keybindings.json $HOME/.config/Code/User/keybindings.json ln -sf $HOME/.dotfiles/codium/keybindings.json $HOME/.config/VSCodium/User/keybindings.json
ln -sf $HOME/.dotfiles/codium/settings.json $HOME/.config/Code/User/settings.json ln -sf $HOME/.dotfiles/codium/settings.json $HOME/.config/VSCodium/User/settings.json
mkdir -p $HOME/.config/terminator/ mkdir -p $HOME/.config/terminator/
ln -sf $HOME/.dotfiles/terminator/config $HOME/.config/terminator/config ln -sf $HOME/.dotfiles/terminator/config $HOME/.config/terminator/config