diff --git a/create_symlinks.sh b/create_symlinks.sh index 8a5f0d0..78c31f3 100755 --- a/create_symlinks.sh +++ b/create_symlinks.sh @@ -10,7 +10,7 @@ dir=~/Documents/dotfiles # dotfiles directory olddir=~/dotfiles_old # old dotfiles backup directory -files="vim vimrc zsh zshrc tmux.conf zpreztorc" # list of files/folders to symlink in homedir +files="vim vimrc zsh zshrc tmux.conf zpreztorc gitconfig gitignore_global" # list of files/folders to symlink in homedir ########## # create dotfiles_old in homedir diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..d5faa48 --- /dev/null +++ b/gitconfig @@ -0,0 +1,40 @@ +[user] + email = loic.gremaud@arcanite.ch + name = Loïc Gremaud + signingkey = 8B2741BF148B1059065A71EEE81E8B180465D116 ;540 + ;signingkey = BAE2CD06F0A3753A0F8D0A21D4620E6DF3E0121D ;539 + ;signingkey = 4F78275C96E34F56920CF7B5CACB2A128E557EFD ;W + token = REPLACE HERE TOKEN +[commit] + gpgSign = true +[gpg] + program = gpg2 +[tag] + forceSignAnnotated = false +[diff] + tool = vimdiff +[difftool] + prompt = false +[alias] + d = difftool + adog = log --all --decorate --oneline --graph + dog = log --decorate --oneline --graph +[core] + editor = nvim + excludesfile = /home/legrems/.gitignore_global +[push] + default = current + +[pager] + diff = delta + log = delta + reflog = delta + show = delta +[delta] + plus-style = "syntax #012800" + minus-style = "syntax #340001" + syntax-theme = Monokai Extended + navigate = true + side-by-side = true +[interactive] + diffFilter = delta --color-only diff --git a/gitignore_global b/gitignore_global new file mode 100644 index 0000000..b39f5e7 --- /dev/null +++ b/gitignore_global @@ -0,0 +1,2 @@ +.autoenv.zsh +.autoenv_leave.zsh diff --git a/vim/vim b/vim/vim new file mode 120000 index 0000000..c3c0b90 --- /dev/null +++ b/vim/vim @@ -0,0 +1 @@ +/home/legrems/Documents/dotfiles/vim \ No newline at end of file diff --git a/vimrc b/vimrc index e48080b..9194394 100644 --- a/vimrc +++ b/vimrc @@ -436,7 +436,7 @@ set modifiable nnoremap ct :set cursorline! " Folding -set foldnestmax=2 +set foldnestmax=10 set foldmethod=indent set nofoldenable diff --git a/zsh/generic.sh b/zsh/generic.sh index a78a01e..00c7bf9 100644 --- a/zsh/generic.sh +++ b/zsh/generic.sh @@ -3,6 +3,13 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" fi +SSHAGENT=/usr/bin/ssh-agent +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! __conda_setup="$('/home/legrems/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"