Added valgrind alias, rfc-syntax vim, norm in vims19

5 files changed, 37 insertions, 15 deletions

diff --git a/.bashrc b/.bashrc
index a71a9df..8c74b9c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -2,14 +2,14 @@
 # .bashrc #
 ###########
 
-alias ls='ls --color=auto'
+alias ls='ls -G'
 alias grep='grep --color=auto'
 alias ll='ls -l'
 alias la='ls -A'
 alias v='vim'
 
 # adding superuser bin to PATH
-export PATH="/sbin:$PATH"
+export PATH="/sbin:$PATH:/bin:/usr/bin"
 
 # man with color
 export LESS_TERMCAP_mb=$'\e[1;32m'
diff --git a/.pluggins.vim b/.pluggins.vim
index 883e54d..2c1e561 100644
--- a/.pluggins.vim
+++ b/.pluggins.vim
@@ -20,6 +20,7 @@ call plug#begin()
     Plug 'cespare/vim-toml'                   " toml
     Plug 'ziglang/zig.vim'                    " zig
     Plug 'vim-scripts/applescript.vim'        " applescript
+    Plug 'vim-scripts/rfc-syntax'             " rfc
 
     " s19 at home
     Plug 'cacharle/vim-42header'              " 42 header
@@ -33,7 +34,6 @@ call plug#begin()
     " Plug 'sheerun/vim-polyglot'             " better syntax highlight
     " Plug 'unblevable/quick-scope'           " highlight first char to jump to word
     " Plug 'jez/vim-superman'                 " man pages in vim (too slow)
-    " Plug 'vim-scripts/rfc-syntax'             " rfc
     " Plug 'tacahiroy/ctrlp-funky'              " extension to search function
     " Plug 'easymotion/vim-easymotion' " TODO very intresting
 
diff --git a/.vimrc b/.vimrc
index 634e947..d68c7ed 100644
--- a/.vimrc
+++ b/.vimrc
@@ -246,7 +246,7 @@ autocmd Filetype vim setlocal foldmethod=marker
 
 autocmd FileType haskell set formatprg=stylish-haskell
 
-autocmd FileType lisp set shiftwidth=2
+autocmd FileType lisp,yaml,json set shiftwidth=2
 
 autocmd FileType python set keywordprg=pydoc3
 " }}}
@@ -286,7 +286,7 @@ nmap ga <Plug>(EasyAlign)
 " }}}
 
 " c_formatter_42 {{{
-let g:c_formatter_42_set_equalprg=1
+let g:c_formatter_42_set_equalprg=0
 let g:c_formatter_42_format_on_save=0
 " }}}
 
@@ -305,13 +305,15 @@ endfunction
 
 command! CountScopeLines call s:CountScopeLines()
 
-command! Norm execute '!norminette ' . expand("%")
-
 " disable paste on enter
 " (need to be at the end or overwritted by something)
-nnoremap <CR> j
+" nnoremap <CR> j
 
 " copy/paste with system {{{
-vnoremap <C-S-c> y:call system("pbcopy", getreg("\""))<CR>
-nnoremap <C-S-m> :call setreg("\"",system("pbpaste"))<CR>p
+vnoremap <leader>c y:call system("pbcopy", getreg("\""))<CR>
+nnoremap <leader>v :call setreg("\"",system("pbpaste"))<CR>p
 " }}}
+
+inoremap <C-a> <C-n>
+
+command! TagsUpdate :call system('ctags $(find . -type f -name "*.c" -o -name "*.h")')
diff --git a/.zsh_aliases b/.zsh_aliases
index 0e32410..915a058 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -74,6 +74,11 @@ gpa() {
     [ -z "$1" ] && branch=master
     git remote | xargs -I{} git push {} "$branch"
 }
+gpaf() {
+    branch="$1"
+    [ -z "$1" ] && branch=master
+    git remote | xargs -I{} git push -f {} "$branch"
+}
 
 gcl-xyz() {
    git clone --recurse-submodules "git@cacharle.xyz:/srv/git/$1.git"
@@ -149,3 +154,9 @@ alias pydoc='pydoc3'
 alias filter-valgrind="sed -e 's/==[0-9]*==/==/' -e 's/0x[0-9A-F]*//'"
 
 alias ssh-add-me="ssh-add -K $HOME/.ssh/id_rsa"
+
+alias valgrind-shell='valgrind --trace-children=no --leak-check=yes --child-silent-after-fork=yes --show-leak-kinds=definite'
+
+alias gcc-include-paths='echo | gcc -E -Wp,-v -'
+
+alias g++=clang++
diff --git a/.zshrc b/.zshrc
index ac4ab47..ff6ae93 100644
--- a/.zshrc
+++ b/.zshrc
@@ -106,15 +106,24 @@ source $HOME/.zsh/zsh-you-should-use/you-should-use.plugin.zsh         # alias r
 
 export LFS=/mnt
 
-export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:$HOME/.brew/bin:$DOTDIR/bin:$HOME/bin"
+export PATH="/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:$HOME/.brew/bin:$DOTDIR/bin:$HOME/bin"
 
 export GPG_TTY=$(tty)  # fixing gpg fatal error about tty
 
-export MINISHELL_TEST_BONUS=yes
-export MINISHELL_TEST_PAGER=vim
-export MINISHELL_TEST_FLAGS=-DMINISHELL_TEST
+# export MINISHELL_TEST_BONUS=yes
+# export MINISHELL_TEST_PAGER=vim
+# export MINISHELL_TEST_FLAGS=-DMINISHELL_TEST
 
 # 19fetch
 
 # Added by c_formatter_42
-export PATH="$PATH:/Users/cacharle/git/c_formatter_42"
+# export PATH="$PATH:/Users/cacharle/git/c_formatter_42"
+
+# export DOCKER_TLS_VERIFY=1
+# export MACHINE_STORAGE_PATH=/Users/$(whoami)/goinfre
+# export DOCKER_CERT_PATH=/Users/$(whoami)/goinfre/certs
+# export DOCKER_HOST=tcp://$(docker-machine ip default):2376
+# eval $(docker-machine env default)
+
+# export MINIKUBE_IN_STYLE=false
+# export MINIKUBE_HOME=/Users/cacharle/goinfre/test_minikube