[GIT] Auto rebase/stash

.config/alacritty/alacritty.toml

@@ -54,5 +54,5 @@ dynamic_title = true
 option_as_alt = "None"
 
 [window.padding]
-x = 0
+x = 2
 y = 0

gitconfig/gitconfig

@@ -33,3 +33,7 @@ email = github@murgi.de
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[rebase]
+	autoStash = true
+[pull]
+	rebase = true

nvim/init.vim

@@ -65,7 +65,7 @@ function! BuildYCM(info)
   " - name:   name of the plugin
   " - status: 'installed', 'updated', or 'unchanged'
   " - force:  set on PlugInstall! or PlugUpdate!
-  if a:info.status == 'installed' || a:info.force
+  if a:info.status == 'installed' || a:info.status == 'updated' || a:info.force
     execute '!' . g:python_interpreter . ' ./install.py --all'
   endif
 endfunction
@@ -242,9 +242,37 @@ nmap <Leader>t :call TextWrapToggle()<CR>
 "augroup END
 
 "Copying
+if !exists('g:vscode')
 lua << EOF
-    vim.g.clipboard = 'osc52'
+vim.g.clipboard = {
+  name = 'OSC 52',
+  copy = {
+    ['+'] = require('vim.ui.clipboard.osc52').copy('+'),
+    ['*'] = require('vim.ui.clipboard.osc52').copy('*'),
+  },
+  paste = {
+    ['+'] = require('vim.ui.clipboard.osc52').paste('+'),
+    ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
+  },
+}
+if vim.env.TMUX ~= nil then
+  local copy = {'tmux', 'load-buffer', '-w', '-'}
+  local paste = {'bash', '-c', 'tmux refresh-client -l && sleep 0.05 && tmux save-buffer -'}
+  vim.g.clipboard = {
+    name = 'tmux',
+    copy = {
+      ['+'] = copy,
+      ['*'] = copy,
+    },
+    paste = {
+      ['+'] = paste,
+      ['*'] = paste,
+    },
+    cache_enabled = 0,
+  }
+end
 EOF
+endif
 set clipboard=unnamedplus,unnamed " Copy/Paste
 
 " Airline
@@ -301,16 +329,16 @@ let g:UltiSnipsEditSplit="vertical"
 set rtp+=~/.config/nvim/my-snippets
 
 " Folding
-set foldmethod=syntax
+set foldmethod=indent
 set foldlevel=100
-" Use F9 to toggle folding
+" Use F9 or <Leader>z to toggle folding
 inoremap <F9> <C-O>za
 nnoremap <F9> za
 onoremap <F9> <C-C>za
 vnoremap <F9> zf
-nnoremap <Leader>a za
-onoremap <Leader>a <C-C>za
-vnoremap <Leader>a zf
+nnoremap <Leader>z za
+onoremap <Leader>z <C-C>za
+vnoremap <Leader>z zf
 
 try
     source ~/.config/nvim/.vimrc_config_expand_region

tmux/.tmux.conf

@@ -74,7 +74,8 @@ bind-key C-o send-keys C-o
 # move tmux copy buffer into x clipboard
 # Vi copypaste mode
 set-window-option -g mode-keys vi
-set-option -s set-clipboard on
+set -g allow-passthrough on
+set-option -g set-clipboard on
 set -g @yank_with_mouse off
 set -g @yank_action 'copy-pipe'
 bind-key -Tcopy-mode-vi 'C-right' send -X next-word

update_mac.sh

@@ -11,10 +11,10 @@ function set_permissions {
     echo "----------"
     echo "Disabling Quarantine for Casks ..."
     echo "----------"
-    find $PREFIX/Caskroom -name *.app -exec bash -c "xattr -d com.apple.quarantine {} 2> /dev/null" \;
-    find $PREFIX/Caskroom -type f -perm +111 -exec bash -c "xattr -d com.apple.quarantine {} 2> /dev/null" \; 
-    find /Applications/ -name *.app -exec bash -c 'xattr -d com.apple.quarantine "{}" 2> /dev/null' \;
-    find /Applications/ -type f -perm +111 -exec bash -c 'xattr -d com.apple.quarantine "{}" 2> /dev/null' \;
+    sudo find $PREFIX/Caskroom -name *.app -exec bash -c "xattr -d com.apple.quarantine {} 2> /dev/null" \;
+    sudo find $PREFIX/Caskroom -type f -perm +111 -exec bash -c "xattr -d com.apple.quarantine {} 2> /dev/null" \; 
+    sudo find /Applications/ -name *.app -exec bash -c 'xattr -d com.apple.quarantine "{}" 2> /dev/null' \;
+    sudo find /Applications/ -type f -perm +111 -exec bash -c 'xattr -d com.apple.quarantine "{}" 2> /dev/null' \;
 }
 
 function software_update {
@@ -29,18 +29,18 @@ function update_brew {
     echo "Updating brew software"
     echo "----------"
     brew update
-    brew upgrade
+    sudo -u $USER brew upgrade
     echo "----------"
     echo "Updating casks"
     echo "----------"
-    brew upgrade --cask --greedy --verbose
+    sudo -u $USER brew upgrade --cask --greedy --verbose
 }
 
 function cleanup {
     echo "----------"
     echo "Running cleanup"
     echo "----------"
-    brew cleanup -s
+    sudo -u $USER brew cleanup -s
 }
 
 function diagnostics {

zsh/.mac_config.zsh_mac.example

@@ -19,3 +19,13 @@ export PATH="$HOMEBREWPREFIX/opt/coreutils/libexec/gnubin:$HOME/.local/bin:$HOME
 # Research
 # export PATH="/Users/fabian/Labor/Research/code_signing/02-tools:$PATH"
 alias tailscale=/Applications/Tailscale.app/Contents/MacOS/Tailscale
+alias virt-manager="LD_PRELOAD=/opt/homebrew/Cellar/glib/2.86.0/lib virt-manager"
+
+HOMEBREW_COMMAND_NOT_FOUND_HANDLER="$(brew --repository)/Library/Homebrew/command-not-found/handler.sh"
+if [ -f "$HOMEBREW_COMMAND_NOT_FOUND_HANDLER" ]; then
+  source "$HOMEBREW_COMMAND_NOT_FOUND_HANDLER";
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="$HOMEBREW_PREFIX/lib:${DYLD_FALLBACK_LIBRARY_PATH}"
+export GI_TYPELIB_PATH="$HOMEBREW_PREFIX/lib/girepository-1.0:${GI_TYPELIB_PATH}"
+export PKG_CONFIG_PATH="$HOMEBREW_PREFIX/lib/pkgconfig:$HOMEBREW_PREFIX/share/pkgconfig:${PKG_CONFIG_PATH}"

zsh/.zshrc

@@ -6,6 +6,15 @@
 [[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh
 [[ -f ~/.zsh/.local_config ]] && source ~/.zsh/.local_config
 
+update_dotfiles() {
+    cd ~/dotfiles || return
+    if git fetch --dry-run 2>&1 | grep -q .; then
+        git pull > /dev/null 2>&1
+    fi
+}
+
+update_dotfiles 2>&1 &!
+export LC_OSC52=1
 
 # Load Antidote
 mkdir -p ${ZDOTDIR:-~}/.cache/zsh
@@ -18,12 +27,28 @@ fi
 
 zstyle ':completion:*:ssh:*' hosts off
 zstyle ':completion:*:scp:*' hosts off
+
+# Run rehash for external commands
+zstyle ":completion:*:commands" rehash 1
 # source antidote and load plugins from `${ZDOTDIR:-~}/.zsh_plugins.txt`
 source ${ZDOTDIR:-~}/.antidote/antidote.zsh
 antidote load ${plugins_txt} ${static_file}
 
 setopt interactivecomments
-setopt HIST_IGNORE_SPACE
+
+# History options
+HISTSIZE=100000                  # Set the amount of lines you want saved
+SAVEHIST=100000                  # This is required to actually save them, needs to match with HISTSIZE
+setopt EXTENDED_HISTORY          # Write the history file in the ":start:elapsed;command" format.
+setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
+setopt SHARE_HISTORY             # Share history between all sessions.
+setopt HIST_EXPIRE_DUPS_FIRST    # Expire duplicate entries first when trimming history.
+setopt HIST_IGNORE_DUPS          # Don\'t record an entry that was just recorded again.
+setopt HIST_IGNORE_ALL_DUPS      # Delete old recorded entry if new entry is a duplicate.
+setopt HIST_FIND_NO_DUPS         # Do not display a line previously found.
+setopt HIST_IGNORE_SPACE         # Don\'t record an entry starting with a space.
+setopt HIST_SAVE_NO_DUPS         # Don\'t write duplicate entries in the history file.
+setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
 # Clear screen by ctrl+q
 bindkey '^q' clear-screen