[GIT] Auto rebase/stash

.config/alacritty/alacritty.toml

@@ -0,0 +1,58 @@
+[general]
+import = ["~/.config/alacritty/solarized_light.toml"]
+live_config_reload = true
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 14
+
+[font.bold]
+family = "Fira Mono for Powerline"
+style = "Bold"
+
+[font.italic]
+family = "Fira Mono for Powerline"
+style = "Regular"
+
+[font.normal]
+family = "Fira Mono for Powerline"
+style = "Medium"
+
+[[keyboard.bindings]]
+key = "F"
+mods = "Control"
+
+[keyboard.bindings.command]
+args = ["-c", "python3 ~/.config/alacritty/color_switcher.py"]
+program = "zsh"
+
+[[keyboard.bindings]]
+key = "T"
+mods = "Command"
+
+[keyboard.bindings.command]
+args = ["-e", "zsh"]
+program = "alacritty"
+
+[scrolling]
+history = 0
+
+[selection]
+save_to_clipboard = false
+
+[terminal]
+osc52 = "OnlyCopy"
+
+[terminal.shell]
+args = ["-c", "$HOME/.tmux/tmux_attach.sh"]
+program = "/bin/zsh"
+
+[window]
+dynamic_title = true
+option_as_alt = "None"
+
+[window.padding]
+x = 2
+y = 0

.config/alacritty/alacritty.yml

@@ -1,43 +0,0 @@
-import:
-  - ~/.config/alacritty/schemes.yml
-
-env:
-  TERM: xterm-256color
-font:
-  # The size to use.
-  size: 12
-  # The normal (roman) font face to use.
-  normal:
-    family: "MesloLGS NF"
-    # Style can be specified to pick a specific face.
-    style: Regular
-  bold:
-    family: "MesloLGS NF"
-    # Style can be specified to pick a specific face.
-    style: Bold
-  bold:
-    family: "MesloLGS NF"
-    # Style can be specified to pick a specific face.
-    style: Bold
-
-window:
-  dynamic_title: true
-  padding:
-    x: 0
-    y: 0
-
-scrolling:
-  history: 0
-
-shell:
-  program: zsh
-  args:
-    - "-c"
-    - "$HOME/.tmux/tmux_attach.sh"
-
-alt_send_esc: false
-live_config_reload: true
-
-key_bindings:
-  - { key: F, mods: Control, command: {program: "zsh", args: ["-c","python3 ~/.config/alacritty/color_switcher.py"]} } 
-  - { key: T, mods: Command, command: {program: "alacritty", args: ["-e","zsh"]} } # Spawn alacritty without tmux

.config/alacritty/color_switcher.py

@@ -2,14 +2,15 @@
 
 import os
 import re
+import sys
 
-
-CONFIG_FILE_NAME = "schemes.yml"
+ALACRITTY_CONFIG_FILE_NAME = "alacritty.toml"
 CONFIG_FILE_DIR = os.path.expanduser("~/.config/alacritty/")
-CONFIG_FILE_PATH = os.path.join(CONFIG_FILE_DIR, CONFIG_FILE_NAME)
+ALACRITTY_CONFIG_FILE_PATH = os.path.join(CONFIG_FILE_DIR, ALACRITTY_CONFIG_FILE_NAME)
 
-COLOR_SCHEME_LINE_SEARCH = "colors: \*(\S+)"
-COLOR_SCHEME_LINE_TEMPLATE = "colors: *{}\n"
+COLOR_SCHEME_LINE_SEARCH = r'import = \[.*\]'
+ALACRITTY_LIGHT_THEME="solarized_light.toml"
+ALACRITTY_DARK_THEME="dark_mode.toml"
 
 NVIM_CONFIG_FILE_DIR = os.path.expanduser("~/.config/nvim/")
 NVIM_CONFIG_FILE_NAME = "scheme.vim"
@@ -18,30 +19,37 @@ NVIM_CONFIG_FILE_PATH = os.path.join(NVIM_CONFIG_FILE_DIR, NVIM_CONFIG_FILE_NAME
 NVIM_COLOR_SCHEME_LINE_SEARCH = "set background=(\S+)\ncolorscheme (\S+)"
 NVIM_COLOR_SCHEME_LINE_TEMPLATE = "set background={}\ncolorscheme {}"
 
-def change_alacritty_theme():
-    with open(CONFIG_FILE_PATH, "r") as config_file:
-        config_file.seek(0)
-        lines = config_file.readlines()
+def change_alacritty_theme(light_mode=None):
+    with open(ALACRITTY_CONFIG_FILE_PATH, "r") as scheme_file:
+        scheme_file.seek(0)
+        lines = scheme_file.readlines()
 
     colors_line_index = -1
     for i, line in enumerate(lines):
         match = re.search(COLOR_SCHEME_LINE_SEARCH, line)
         if match is not None:
-            current_color_scheme = match.group(1)
             colors_line_index = i
+            color_line = lines[i]
+            break
     
-
-    if current_color_scheme == "dark_mode":
-        new_scheme = "solarized_light"
+    if light_mode is None:
+        if ALACRITTY_DARK_THEME in color_line:
+            color_line = color_line.replace(ALACRITTY_DARK_THEME, ALACRITTY_LIGHT_THEME)
+            new_scheme = "light"
         else:
-        new_scheme = "dark_mode"
-
-    lines[colors_line_index] = COLOR_SCHEME_LINE_TEMPLATE.format(
-        new_scheme)
-
-    with open(CONFIG_FILE_PATH, "w") as config_file:
+            color_line = color_line.replace(ALACRITTY_LIGHT_THEME, ALACRITTY_DARK_THEME)
+            new_scheme = "dark"
+    elif light_mode == True:
+        new_scheme = "light"
+        color_line = color_line.replace(ALACRITTY_DARK_THEME, ALACRITTY_LIGHT_THEME)
+    else:
+        color_line = color_line.replace(ALACRITTY_LIGHT_THEME, ALACRITTY_DARK_THEME)
+        new_scheme = "dark"
+    lines[colors_line_index] = color_line
+    with open(ALACRITTY_CONFIG_FILE_PATH, "w") as scheme_file:
         for line in lines:
-            config_file.write(line)
+            scheme_file.write(line)
+
     return new_scheme
 
 def change_vim_theme(light_mode=False):
@@ -57,10 +65,13 @@ def change_vim_theme(light_mode=False):
         config = config_file.write(res)
     
 
-def main():
-    new_theme = change_alacritty_theme()
-    change_vim_theme(new_theme == "solarized_light")
+def main(light_mode=None):
+    new_theme = change_alacritty_theme(light_mode)
+    change_vim_theme(new_theme == "light")
     
 
 if __name__=="__main__":
+    if len(sys.argv) == 2:
+        main(sys.argv == "light")
+    else:
         main()

.config/alacritty/dark_mode.toml

@@ -0,0 +1,23 @@
+[colors.bright]
+black = "0x555753"
+blue = "0x729fcf"
+cyan = "0x34e2e2"
+green = "0x8ae234"
+magenta = "0xad7fa8"
+red = "0xef2929"
+white = "0xeeeeec"
+yellow = "0xfce94f"
+
+[colors.normal]
+black = "0x2e3436"
+blue = "0x3465a4"
+cyan = "0x06989a"
+green = "0x4e9a06"
+magenta = "0x75507b"
+red = "0xcc0000"
+white = "0xd3d7cf"
+yellow = "0xc4a000"
+
+[colors.primary]
+background = "0x323232"
+foreground = "0xeeeeec"

.config/alacritty/screenshot_mode.py

@@ -0,0 +1,41 @@
+#! /usr/bin/env python3
+# vim:fenc=utf-8
+#
+# Copyright © 2023 ising <ising@mac-nurmi>
+#
+# Distributed under terms of the MIT license.
+
+"""
+
+"""
+import os
+import sys
+import color_switcher
+
+CONFIG_FILE_NAME = "alacritty.toml"
+CONFIG_FILE_DIR = os.path.expanduser("~/.config/alacritty/")
+CONFIG_FILE_PATH = os.path.join(CONFIG_FILE_DIR, CONFIG_FILE_NAME)
+
+def main(turn_on=False):
+    padding_line = None
+    with open(CONFIG_FILE_PATH, "r") as config_file:
+        config_file.seek(0)
+        config_lines = config_file.readlines()
+        for i, line in enumerate(config_lines):
+            if "[window.padding]" in line and "x =" in config_lines[i+1]:
+                padding_line = i
+    if padding_line is None:
+        return
+    if turn_on:
+        config_lines[padding_line+1] = "x = 10\n"
+        config_lines[padding_line+2] = "y = 10\n"
+    else:
+        config_lines[padding_line+1] = "x = 0\n"
+        config_lines[padding_line+2] = "y = 0\n"
+    with open(CONFIG_FILE_PATH, "w") as config_file:
+        for line in config_lines:
+            config_file.write(line)
+
+if __name__=="__main__":
+    main(len(sys.argv) == 2 and sys.argv[1] == "on")
+    #color_switcher.main(len(sys.argv) == 2 and sys.argv[1] == "on")

.config/alacritty/solarized_light.toml

@@ -0,0 +1,23 @@
+[colors.bright]
+black = "0x002b36"
+blue = "0x839496"
+cyan = "0x93a1a1"
+green = "0x586e75"
+magenta = "0x6c71c4"
+red = "0xcb4b16"
+white = "0xfdf6e3"
+yellow = "0x657b83"
+
+[colors.normal]
+black = "0x073642"
+blue = "0x268bd2"
+cyan = "0x2aa198"
+green = "0x859900"
+magenta = "0xd33682"
+red = "0xdc322f"
+white = "0xeee8d5"
+yellow = "0xb58900"
+
+[colors.primary]
+background = "0xfdf6e3"
+foreground = "0x586e75"

.gitignore

@@ -1,3 +1,4 @@
 *.swp
 tags
 .DS_STORE
+__pycache__

.gitignore_global

@@ -0,0 +1 @@
+.DS_Store

brew_autoupdate

@@ -0,0 +1,10 @@
+#!/bin/sh
+export HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK=1
+export PATH='/opt/homebrew/Library/Homebrew/shims/shared:/opt/homebrew/opt/coreutils/libexec/gnubin:/Users/ising/.local/bin:/opt/homebrew/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/TeX/texbin:/Applications/VMware Fusion.app/Contents/Public:/Users/ising/.cargo/bin:/opt/homebrew/sbin:/Users/ising/go/bin:/opt/homebrew/Library/Taps/homebrew/homebrew-autoupdate/cmd:/opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/cmd:/opt/homebrew/Library/Taps/homebrew/homebrew-services/cmd'
+export HOMEBREW_CACHE='/Users/ising/Library/Caches/Homebrew'
+export HOMEBREW_LOGS='/Users/ising/Library/Logs/Homebrew'
+export SUDO_ASKPASS='/Users/ising/Library/Application Support/com.github.domt4.homebrew-autoupdate/brew_autoupdate_sudo_gui'
+defaults export com.apple.dock "/tmp/dock-layout.plist"
+/bin/date && /opt/homebrew/bin/brew update && /opt/homebrew/bin/brew upgrade --formula -v && /opt/homebrew/bin/brew upgrade --cask -v && /opt/homebrew/bin/brew cleanup && /usr/bin/open -g /opt/homebrew/Library/Taps/homebrew/homebrew-autoupdate/notifier/brew-autoupdate.app
+defaults import com.apple.dock "/tmp/dock-layout.plist"
+killall dock

clone_and_link.sh

@@ -12,3 +12,5 @@ ln -Tsv ~/.zsh/.zshrc $HOME/.zshrc
 ln -Tsv $PWD/tmux $HOME/.tmux
 ln -Tsv ~/.tmux/.tmux.conf $HOME/.tmux.conf
 ln -Tsv $PWD/nvim $HOME/.config/nvim
+ln -Tsv $PWD/.config/alacritty $HOME/.config/alacritty
+ln -fsv $PWD/virtualenvwrapper/* $VIRTUALENVWRAPPER_HOOK_DIR

clone_and_link_mac.sh

@@ -11,7 +11,10 @@ gln -Tsv $PWD/zsh $HOME/.zsh
 gln -Tsv ~/.zsh/.zshrc $HOME/.zshrc
 gln -Tsv $PWD/tmux $HOME/.tmux
 gln -Tsv ~/.tmux/.tmux.conf $HOME/.tmux.conf
-mkdir -p $HOME/.config/nvim
 gln -Tsv $PWD/nvim $HOME/.config/nvim
 gln -Tsv $PWD/.config/alacritty $HOME/.config/alacritty
-gln -Tsv $PWD/zsh/.p10k.mac.zsh.example  $PWD/zsh/.p10k.mac.zsh
+gln -Tsv $PWD/zsh/.p10k.zsh_mac.example $PWD/zsh/.p10k.mac.zsh
+gln -Tsv $PWD/zsh/.mac_config.example $PWD/zsh/.mac_config
+gln -Tsv $PWD/zsh/.virtual_env_config.zsh_mac.example $PWD/zsh/.virtual_env_config.zsh
+gln -fsv $PWD/virtualenvwrapper/* $VIRTUALENVWRAPPER_HOOK_DIR
+gln -Tsv $PWD/update_mac.sh $HOME/update_mac.sh

compile_ycm.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+#
+# compile_ycm.sh
+# Copyright (C) 2024 ising <ising@mac-nurmi>
+#
+# Distributed under terms of the MIT license.
+#
+
+python3 ~/.local/share/nvim/plugged/install.py --all

gitconfig/fhms.gitconfig

@@ -0,0 +1,3 @@
+[user]
+name = Fabian Ising
+email = f.ising@fh-muenster.de

gitconfig/gitconfig

@@ -0,0 +1,39 @@
+# This is Git's per-user configuration file.
+[user]
+# Please adapt and uncomment the following lines:
+name = Fabian Ising
+email = github@murgi.de
+
+[includeIf "hasconfig:remote.*.url:https://github.com/**"]
+    path = ~/dotfiles/gitconfig/github.gitconfig
+[includeIf "hasconfig:remote.*.url:git@github.com/**"]
+    path = ~/dotfiles/gitconfig/github.gitconfig
+[includeIf "hasconfig:remote.*.url:https://git.fh-muenster.de/**"]
+    path = ~/dotfiles/gitconfig/fhms.gitconfig
+[includeIf "hasconfig:remote.*.url:git@git.fh-muenster.de:*/**"]
+    path = ~/dotfiles/gitconfig/fhms.gitconfig
+[includeIf "hasconfig:remote.*.url:ssh://git@git.fh-muenster.de:*/**"]
+    path = ~/dotfiles/gitconfig/fhms.gitconfig
+[includeIf "hasconfig:remote.*.url:https://vcs.murgi.de/**"]
+    path = ~/dotfiles/gitconfig/murgi.gitconfig
+[includeIf "hasconfig:remote.*.url:ssh://git@vcs.murgi.de:*/**"]
+    path = ~/dotfiles/gitconfig/murgi.gitconfig
+[includeIf "hasconfig:remote.*.url:git@vcs.murgi.de:*/**"]
+    path = ~/dotfiles/gitconfig/murgi.gitconfig
+[includeIf "hasconfig:remote.*.url:git@git-int.sit.fraunhofer.de:*/**"]
+    path = ~/dotfiles/gitconfig/sit.gitconfig
+[includeIf "hasconfig:remote.*.url:https://git-int.sit.fraunhofer.de/**"]
+    path = ~/dotfiles/gitconfig/sit.gitconfig
+[core]
+	excludesfile = /Users/ising/dotfiles/.gitignore_global
+[submodule]
+	recurse = true
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[rebase]
+	autoStash = true
+[pull]
+	rebase = true

gitconfig/github.gitconfig

@@ -0,0 +1,3 @@
+[user]
+name = Fabian Ising
+email = github@murgi.de

gitconfig/murgi.gitconfig

@@ -0,0 +1,3 @@
+[user]
+name = Fabian Ising
+email = fabian@murgi.de

gitconfig/sit.gitconfig

@@ -0,0 +1,3 @@
+[user]
+name = Fabian Ising
+email = fabian.ising@sit.fraunhofer.de

link_config.sh

@@ -11,3 +11,4 @@ for filename in .config/*; do
 done
 
 ln -Ts $PWD/nvim $HOME/.config/nvim
+ln -Ts $PWD/gitconfig/gitconfig $HOME/.gitconfig

nvim/init.vim

@@ -1,15 +1,40 @@
 set nocompatible
 filetype off
 
+" Find python
+if has("macunix")
+    " Required for virtualenvs
+    let arch=substitute(system('uname -m'), '\n', '', '')
+    if arch == 'arm64'
+        let g:python_interpreter=expand("~/python-envs/neovim/bin/python3")
+    else
+        let g:python_interpreter="/usr/local/bin/python3"
+    endif
+    let g:tagbar_ctags="/opt/homebrew/bin/ctags"
+else
+    let g:python_interpreter = 'python3'
+endif
+let g:python3_host_prog=g:python_interpreter
+
 " Plugins
 " Note: on most systems, this will make the plugins reside in \
 " ~/.local/share/nvim/plugged/
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+let data_dir = has('nvim') ? stdpath('data') . '/site' : expand('~/.vim')
 if empty(glob(data_dir . '/autoload/plug.vim'))
   silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  let &runtimepath = &runtimepath
   autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
+
+" Disable Perl
+let g:loaded_perl_provider = 0
+
 call plug#begin()
+
+if !exists('g:vscode')
+" Warn about plugin updates
+Plug 'semanser/vim-outdated-plugins'
+
 " Powerline replacement
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
@@ -35,18 +60,22 @@ Plug 'ConradIrwin/vim-bracketed-paste'
 Plug 'christoomey/vim-tmux-navigator'
 
 " YouCompleteMe
-Plug 'Valloric/YouCompleteMe'
+function! BuildYCM(info)
+  " info is a dictionary with 3 fields
+  " - name:   name of the plugin
+  " - status: 'installed', 'updated', or 'unchanged'
+  " - force:  set on PlugInstall! or PlugUpdate!
+  if a:info.status == 'installed' || a:info.status == 'updated' || a:info.force
+    execute '!' . g:python_interpreter . ' ./install.py --all'
+  endif
+endfunction
+
+Plug 'ycm-core/YouCompleteMe', { 'do': function('BuildYCM') }
 Plug 'rdnetto/YCM-Generator'
 
 " Git
 Plug 'tpope/vim-fugitive'
 
-" Comments
-Plug 'scrooloose/nerdcommenter'
-
-" Surround
-Plug 'tpope/vim-surround'
-
 " Snippets
 " Track the engine.
 Plug 'SirVer/ultisnips'
@@ -69,6 +98,18 @@ Plug 'lervag/vimtex'
 "Go
 Plug 'fatih/vim-go'
 
+"Macdown (only on macOS)
+"if has("macunix")
+    "Plug 'hashrocket/vim-macdown'
+"endif
+" Comments
+Plug 'scrooloose/nerdcommenter'
+
+" Surround
+Plug 'tpope/vim-surround'
+
+endif
+
 call plug#end()
 
 " Run PlugInstall if there are missing plugins
@@ -81,8 +122,7 @@ filetype plugin indent on
 set cinkeys-=0#
 
 " Terminal emulator settings
-set t_Co=256
-"set term=screen-256color
+set termguicolors
 
 " Color configuration
 try
@@ -90,6 +130,7 @@ try
 catch
     " Ignore non existing file
 endtry
+highlight Comment cterm=italic gui=italic
 syntax enable	" enable syntax processing
 
 " Disable annoying bell
@@ -102,7 +143,8 @@ set modeline
 let mapleader = "\<Space>" " Make space the leader key
 nnoremap <Leader>w :w<CR>| " Write file
 nnoremap <Leader>q :q<CR>| " Close file
-nnoremap <Leader>s :w !sudo tee %<CR>L<CR>
+nnoremap <Leader>s :w !sudo -A tee %<CR>L<CR>
+cmap w!! w !sudo -A tee > /dev/null %
 
 nmap <Leader><Leader> V| " Change to visual line mode
 map q: :q| " No command history
@@ -114,14 +156,23 @@ nmap <Leader>mt :tab sp<CR> | " maximize window to new tab
 nmap <Leader>. <C-w>= | " Split windows equally
 map gb :bnext<CR>
 map gB :bNext<CR>
+if !exists('g:vscode')
 call submode#enter_with('grow/shrink', 'n', '', '<Leader>r', '<Nop>')
 call submode#map('grow/shrink', 'n', '', '+', '<C-w>+')
 call submode#map('grow/shrink', 'n', '', '-', '<C-w>-')
 call submode#map('grow/shrink', 'n', '', '<', '<C-w><')
 call submode#map('grow/shrink', 'n', '', '>', '<C-w>>')
+endif
 set splitbelow
 set splitright
 
+" Delete without copying
+nnoremap <leader>d "_d
+xnoremap <leader>d "_d
+nnoremap <leader>x "_x
+xnoremap <leader>x "_x
+xnoremap <leader>p "_dP
+
 "disable submode timeouts:
 let g:submode_timeout = 0
 " don't consume submode-leaving key
@@ -191,6 +242,37 @@ nmap <Leader>t :call TextWrapToggle()<CR>
 "augroup END
 
 "Copying
+if !exists('g:vscode')
+lua << EOF
+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
@@ -203,9 +285,12 @@ nmap <C-]> <C-w><C-]><C-w>T
 
 " YouCompleteMe
 let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files
-let g:ycm_global_ycm_extra_conf = '~/.config/nvim/.ycm_extra_conf.py' " Standard conf
+let g:ycm_global_ycm_extra_conf = expand('~/.config/nvim/.ycm_extra_conf.py') " Standard conf
 let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar
-let g:ycm_server_python_interpreter = 'python3'
+let g:ycm_server_python_interpreter=g:python_interpreter
+let g:ycm_python_interpreter_path=g:python_interpreter
+" Enable virtualenv autocompletion
+let g:ycm_python_binary_path = 'python3'
 let g:ycm_key_list_select_completion   = ['<C-j>', '<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']
 
@@ -244,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
@@ -269,8 +354,3 @@ catch
 endtry
 let g:tex_flavor = "latex"
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
-
-if has("macunix")
-    " Required for virtualenvs
-    let g:python3_host_prog="/usr/local/bin/python3"
-endif

push.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-#
-# update.sh
-# Copyright (C) 2017 Fabian Ising <fabian@murgi.de>
-#
-# Distributed under terms of the Apache v2.0 license.
-#
-
-git pull
-
-git subtree push --prefix=i3 i3 master
-git subtree push --prefix=tmux tmux master
-git subtree push --prefix=zsh zsh master
-git subtree push --prefix=vim vim master

setup_arch.sh

@@ -5,15 +5,17 @@
 #
 # Distributed under terms of the MIT license.
 #
+set -e
 
 sudo pacman --needed -Sy archlinux-keyring --noconfirm
 sudo pacman --needed -Syu --noconfirm
-sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra neovim zsh tmux openssh alacritty powerline-fonts python-pip --noconfirm
-cp $PWD/nvim/scheme.vim.template $PWD/nvim/scheme.vim
-cp $PWD/.config/alacritty/schemes.yml.template $PWD/.config/alacritty/schemes.yml
-pip3 install neovim
+sudo pacman --needed -Sy base-devel gnome neovim zsh tmux openssh alacritty powerline-fonts python-pip python-pynvim --noconfirm
+
 ./clone_and_link.sh
 ./copy_fonts_arch.sh
+
+cp $PWD/nvim/scheme.vim.template $PWD/nvim/scheme.vim
+cp $PWD/.config/alacritty/schemes.yml.template $PWD/.config/alacritty/schemes.yml
 if [ $SHELL != "/bin/zsh" ]; then
     chsh -s /usr/bin/zsh;
 fi

setup_mac.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/zsh
 #
 # setup_mac.sh
 # Copyright (C) 2022 fabian <fabian@FordPrefect.home>
@@ -6,8 +6,11 @@
 # Distributed under terms of the MIT license.
 #
 
-brew install neovim tmux alacritty coreutils
-pip3 install neovim
+brew install neovim tmux alacritty coreutils cmake golang npm virtualenvwrapper
+source /opt/homebrew/bin/virtualenvwrapper.sh
+mkvirtualenv neovim
+pip3 install pynvim
+npm install -g neovim
 echo For alacritty to work seemlessly with tmux, we will have to add '/usr/local/bin'\
     to the path. This will require your root password.
 sudo launchctl config user path /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin 
@@ -15,16 +18,18 @@ cp $PWD/nvim/scheme.vim.template $PWD/nvim/scheme.vim
 cp $PWD/.config/alacritty/schemes.yml.template $PWD/.config/alacritty/schemes.yml
 ./clone_and_link_mac.sh
 
-for filename in zsh/.*_mac.example; do
-    cp $filename ${filename:0:-12}
+for filename in zsh/.*_mac.example(N); do
+    gln -Tsvf $PWD/$filename $PWD/${filename:0:-12}
 done
 
-for filename in tmux/.*_mac.example; do
-    cp $filename ${filename:0:-12}
+for filename in tmux/.*_mac.example(N); do
+    gln -Tsvf $PWD/$filename $PWD/${filename:0:-12}
 done
 
-for filename in vim/.*_mac.example; do
-    cp $filename ${filename:0:-12}
+for filename in vim/.*_mac.example(N); do
+    gln -Tsvf $PWD/$filename $PWD/${filename:0:-12}
 done
 
+open fonts/*.ttf
+
 echo "You should now start tmux (and zsh) and nvim for automatic plugin installation."

tmux/.tmux.conf

@@ -1,5 +1,6 @@
-set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
-set -g default-terminal "xterm-256color"
+set-environment -g PATH "/usr/local/bin:/bin:/usr/bin:/opt/homebrew/bin"
+set -g default-terminal "tmux-256color"
+set -sa terminal-features ",xterm-256color:RGB"
 
 set -g history-limit 20000
 
@@ -10,6 +11,19 @@ bind-key C-a send-prefix
 bind-key -n C-b send-keys C-b
 #bind-key -n C-b send-prefix
 
+# Use F12 to toggle hotekys on/off for nested remote tmux sessions
+bind -T root F12  \
+  set prefix None \;\
+  set key-table off \;\
+  set status-style "fg=colour245,bg=colour238"\;\
+  refresh-client -S
+
+bind -T off F12 \
+  set -u prefix \;\
+  set -u key-table \;\
+  set -u status-style \;\
+  refresh-client -S
+
 setw -g mode-keys vi
 set-option -g status-keys vi
 
@@ -33,9 +47,10 @@ bind k clear-history\; display "History cleared"
 
 bind-key a set-window-option synchronize-panes
 
-bind r source-file ~/.tmux.conf\; display "Conf reloaded!"
+bind r source-file ~/.tmux.conf\; display "Tmux conf reloaded!"
 
 set -g mouse on
+set-option -g focus-events on
 
 #bind-key -Tcopy-mode-vi 'v' send -X begin-selection
 #bind-key -Tcopy-mode-vi 'y' send -X copy-selection
@@ -59,9 +74,13 @@ 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
+bind-key -Tcopy-mode-vi 'C-left' send -X previous-word
+unbind-key -T copy-mode-vi MouseDragEnd1Pane
 
 if '[ `uname` == Darwin ]' \
     'source-file ~/.tmux/.mac_config'
@@ -78,7 +97,10 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'jimeh/tmux-themepack'
-set -g @themepack 'powerline/double/blue'
+set -g @plugin 'nhdaly/tmux-better-mouse-mode'
+set -g @themepack 'powerline/double/green'
+
+set -g @tpm-clean 'u'
 
 setenv -g TMUX_PLUGIN_MANAGER_PATH "$HOME/.tmux/plugins/"
 

tmux/mac_tmux_wrapper.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-#
-# test.sh
-# Copyright (C) 2018 fabian <fabian@FordPrefect.local>
-#
-# Distributed under terms of the MIT license.
-#
-
-
-export PATH=$PATH:/usr/local/bin
-tmux

tmux/tmux_attach.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # tmux-attach - attach to first unattached session or
 #         create new session if none are found

update_mac.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+ARCH=`uname -m`
+if [[ $ARCH == "arm64" ]]; then
+    PREFIX="/opt/homebrew/"
+else
+    PREFIX="/usr/local/"
+fi
+
+function set_permissions {
+    echo "----------"
+    echo "Disabling Quarantine for Casks ..."
+    echo "----------"
+    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 {
+    echo "----------"
+    echo "Running software update"
+    echo "----------"
+    softwareupdate --all --install --force
+}
+
+function update_brew {
+    echo "----------"
+    echo "Updating brew software"
+    echo "----------"
+    brew update
+    sudo -u $USER brew upgrade
+    echo "----------"
+    echo "Updating casks"
+    echo "----------"
+    sudo -u $USER brew upgrade --cask --greedy --verbose
+}
+
+function cleanup {
+    echo "----------"
+    echo "Running cleanup"
+    echo "----------"
+    sudo -u $USER brew cleanup -s
+}
+
+function diagnostics {
+    echo "----------"
+    echo "Running diagnostics"
+    echo "----------"
+    brew doctor
+    brew missing
+}
+if [[ $* == *--help* ]]; then
+    echo "Usage: $0 [option]"
+    echo "Default options: --brew-update --cleanup --diagnostics"
+    echo -e "Options:\n\t--brew-update\n\t--cleanup\n\t--diagnostics\n\t--permission-fix\n\t--system-update"
+fi
+
+if [[ -z $* ]]; then
+    set -- "$*" "--brew-update --cleanup --diagnostics"
+fi
+
+if [[ $* == *--system-update* ]]; then
+    software_update
+fi
+if [[ $* == *--brew-update* ]]; then
+    update_brew
+fi
+if [[ $* == *--cleanup* ]]; then
+    cleanup
+fi
+if [[ $* == *--diagnostics* ]]; then
+    diagnostics
+fi
+if [[ $* == *--permission-fix* ]]; then
+    set_permissions
+fi

virtualenvwrapper/postactivate

@@ -0,0 +1,6 @@
+#!/bin/zsh
+# This hook is sourced after every virtualenv is activated.
+
+if [[ -n "$TMUX" ]]; then
+    tmux set-environment VIRTUAL_ENV $VIRTUAL_ENV
+fi

virtualenvwrapper/postdeactivate

@@ -0,0 +1,6 @@
+#!/bin/zsh
+# This hook is sourced after every virtualenv is deactivated.
+
+if [[ -n "$TMUX" ]]; then
+    tmux set-environment -r VIRTUAL_ENV
+fi

virtualenvwrapper/postmkvirtualenv

@@ -0,0 +1,4 @@
+#!/bin/zsh
+# This hook is sourced after a new virtualenv is activated.
+
+pip3 install neovim

zsh/.gitignore

@@ -1,4 +1,5 @@
 .*_config*
 !.*_config*.example
+.p10k.zsh
 .p10k.mac.zsh
 antigen/

zsh/.mac_config.example

@@ -1,13 +0,0 @@
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export POWERLINE_CONFIG_COMMAND=/usr/local/bin/powerline-config
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-
-# Set path to work with pycharm ...
-[[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
-PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
-
-test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
-
-# Research
-export PATH="/Users/fabian/Labor/Research/code_signing/02-tools:$PATH"

zsh/.mac_config.zsh_mac.example

@@ -0,0 +1,31 @@
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export JAVA_HOME=`/usr/libexec/java_home`
+defaults write .GlobalPreferences AppleLocale en_DE
+
+# Set path to work with pycharm ...
+# [[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
+
+ARCH=`uname -m`
+if [[ $ARCH == "arm64" ]]; then
+    HOMEBREWPREFIX="/opt/homebrew"
+else
+    HOMEBREWPREFIX="/usr/local"
+fi
+export PATH="$HOMEBREWPREFIX/opt/coreutils/libexec/gnubin:$HOME/.local/bin:$HOMEBREWPREFIX/bin:$PATH:$HOMEBREWPREFIX/sbin"
+
+# test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
+# 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/.virtual_env_config.zsh_mac.example

@@ -1,4 +1,15 @@
+ARCH=`uname -m`
+if [[ $ARCH == "arm64" ]]; then
+    PREFIX="/opt/homebrew"
+else
+    PREFIX="/usr/local"
+fi
+
 export WORKON_HOME=~/python-envs
-export VIRTUALENVWRAPPER_VIRTUALENV=/usr/local/bin/virtualenv
+export VIRTUALENVWRAPPER_VIRTUALENV=$PREFIX/bin/virtualenv
 mkdir -p $WORKON_HOME
-source /usr/local/bin/virtualenvwrapper.sh
+source $PREFIX/bin/virtualenvwrapper.sh
+
+if [ -n "$VIRTUAL_ENV" ] && [[ -f "$VIRTUAL_ENV/bin/activate" ]]; then
+      source $VIRTUAL_ENV/bin/activate;
+fi

zsh/.zsh_plugins.txt

@@ -1,12 +1,18 @@
 # Load OMZ plugins
 ohmyzsh/ohmyzsh
+ohmyzsh/ohmyzsh path:lib
 ohmyzsh/ohmyzsh path:plugins/git
 ohmyzsh/ohmyzsh path:plugins/golang
 ohmyzsh/ohmyzsh path:plugins/ssh-agent
 ohmyzsh/ohmyzsh path:plugins/pip
 ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/brew
 ohmyzsh/ohmyzsh path:plugins/virtualenv
 ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/command-not-found
+ohmyzsh/ohmyzsh path:plugins/docker-compose
+ohmyzsh/ohmyzsh path:plugins/docker
+ohmyzsh/ohmyzsh path:plugins/vi-mode
 
 
 romkatv/powerlevel10k
@@ -15,8 +21,9 @@ zsh-users/zsh-autosuggestions
 zsh-users/zsh-completions
 zsh-users/zsh-history-substring-search
 urbainvaes/fzf-marks
-greymd/docker-zsh-completion
-zdharma-continuum/fast-syntax-highlighting kind:defer
+zdharma-continuum/fast-syntax-highlighting
+# Select with shift
+jirutka/zsh-shift-select
 
 # Initialize completions
 belak/zsh-utils path:completion

zsh/.zshrc

@@ -1,17 +1,21 @@
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
 # confirmations, etc.) must go above this block; everything else may go below.
-#if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  #source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-#fi
-export PATH="$HOME/.local/bin:$PATH"
-
 [[ -f ~/.zsh/.powerline_config ]] && source ~/.zsh/.powerline_config
 [[ -f ~/.zsh/.user_config ]] && source ~/.zsh/.user_config
 [[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh
-[[ -f /usr/share/doc/find-the-command/ftc.zsh ]] && source /usr/share/doc/find-the-command/ftc.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
 static_file=${ZDOTDIR:-~}/.cache/zsh/.zsh_plugins.zsh
@@ -21,28 +25,45 @@ if ! [[ -e ${ZDOTDIR:-~}/.antidote ]]; then
   git clone https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antidote
 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
 
+# Bind Ctrl-W to kill-region
+bindkey "^w" kill-region
+bindkey -v
+VI_MODE_SET_CURSOR=true
+
 alias vim=nvim
 alias sudo='sudo '
 export EDITOR='nvim'
+export VISUAL='nvim'
 
-#PATH="/home/fabian/perl5/bin${PATH:+:${PATH}}"; export PATH;
-#PERL5LIB="/home/fabian/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
-#PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
-#PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT;
-#PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT;
 alias ls="ls --color=always"
-#export PATH="$PATH:${HOME}/Labor/tls-in-muas/starttls-research/99-Tools:/home/fabian/go/bin"
-# For ccache
-#export CCACHE_CPP2=YES
+alias cgrep="grep --color=always"
 
 delzip() {
    unzip -Z -1 "$@" |  xargs -I{} rm -rf {}
@@ -50,15 +71,58 @@ delzip() {
 # mitmproxy
 export MITMPROXY_SSLKEYLOGFILE="~/.mitmproxy/sslkeylogfile.txt"
 
-[[ -f ~/.zsh/.mac_config ]] && source ~/.zsh/.mac_config
+[[ -f ~/.zsh/.mac_config.zsh ]] && source ~/.zsh/.mac_config.zsh
+if `which go &>/dev/null`; then
+    export PATH="$PATH:$(go env GOPATH)/bin"
+    export GOPATH=$(go env GOPATH)
+fi
+
+if [[ -f ~/.ssh/sudo_key ]]; then 
+    [[ -e /tmp/sudo-agent.sock ]] || ssh-agent -a /tmp/sudo-agent.sock &> /dev/null
+    SSH_AUTH_SOCK=/tmp/sudo-agent.sock ssh-add -l | grep -q `ssh-keygen -lf ~/.ssh/sudo_key | awk '{print $2}'` || SSH_AUTH_SOCK=/tmp/sudo-agent.sock ssh-add ~/.ssh/sudo_key
+fi
+
+# Sudo workaround for neovim
+export SUDO_ASKPASS=$(command -v ssh-askpass)
+
+# Workaround for async issues https://github.com/romkatv/powerlevel10k/issues/1554
+unset ZSH_AUTOSUGGEST_USE_ASYNC
+
+# Fixate language
+export LANG="en_US.UTF-8"
+export LC_CTYPE="en_US.UTF-8"
+export TIME_STYLE="long-iso"
 
 # Powerlevel 10k
 # Remove padding on right side
 ZLE_RPROMPT_INDENT=0
 
 # To customize prompt, run `p10k configure` or edit ~/dotfiles/zsh/.p10k.zsh.
-if test -f ~/dotfiles/zsh/.p10k.mac.zsh; then 
+function load_p10k() {
+    if test -f ~/dotfiles/zsh/.p10k.mac.zsh; then 
         source ~/dotfiles/zsh/.p10k.mac.zsh
-else
+    else
         [[ ! -f ~/dotfiles/zsh/.p10k.zsh ]] || source ~/dotfiles/zsh/.p10k.zsh
-fi
+    fi
+}
+load_p10k
+
+alias screenshot_mode='powerlevel10k_plugin_unload; export PS1="$ "; python3 ~/.config/alacritty/screenshot_mode.py on'
+alias screenshot_mode_off='prompt_powerlevel9k_setup; python3 ~/.config/alacritty/screenshot_mode.py off'
+antidote update &> /dev/null &|
+
+# This speeds up pasting w/ autosuggest
+# https://github.com/zsh-users/zsh-autosuggestions/issues/238
+pasteinit() {
+  OLD_SELF_INSERT=${${(s.:.)widgets[self-insert]}[2,3]}
+  zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`?
+}
+
+pastefinish() {
+  zle -N self-insert $OLD_SELF_INSERT
+}
+zstyle :bracketed-paste-magic paste-init pasteinit
+zstyle :bracketed-paste-magic paste-finish pastefinish
+
+# https://github.com/zsh-users/zsh-autosuggestions/issues/351
+ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(bracketed-paste)