Updates and file-splitting for big sur

install/0_basics.sh

@@ -4,43 +4,42 @@
 xcode-select --install
 
 # install homebrew
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 brew doctor
-brew tap homebrew/services
 
 # brew paths
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 
+# basics
+brew install curl
 brew install git
 brew install git-flow
-brew install python@3
+brew install openssl
-brew install ruby
 brew install zsh
-brew link python@3
 
 # install all submodules
+cd ~/dotfiles
 git submodule init
 git submodule update
+git submodule foreach git pull origin master
 
-# link the dotfiles
+# basic config symlinks
 mkdir ~/.config
 ln -s ~/dotfiles/editorconfig ~/.editorconfig
 ln -s ~/dotfiles/gitconfig ~/.gitconfig
 ln -s ~/dotfiles/gitignore ~/.gitignore
-ln -s ~/dotfiles/hammerspoon ~/.hammerspoon
-ln -s ~/dotfiles/karabiner ~/.config/karabiner
-ln -s ~/dotfiles/nvim ~/.config/nvim
-ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 ln -s ~/dotfiles/zsh ~/.zsh
 ln -s ~/dotfiles/zsh/zshrc ~/.zshrc
 
 # set xterm/screen terminals to enable italic fonts in terminal
-# set terminal to xterm-256color!
-# now restart your terminal and hope for the best
 tic ~/dotfiles/other/xterm-256color.terminfo
 
-# set zsh to the default
+# zsh as default
 sudo vim /etc/shells
 chsh -s /usr/local/bin/zsh
 /usr/bin/env zsh
 sudo launchctl config user path $PATH
+
+autoload -Uz compinit
+compinit
+# now restart your terminal and proceed...

install/1_languages.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env zsh
+
+# ruby
+brew install rbenv # restart terminal, then:
+RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/opt/openssl" rbenv install 3.0.0
+rbenv global 3.0.0
+
+# node
+curl -L https://git.io/n-install | bash
+n v8
+n v12
+n latest
+n lts
+npm install -g npm@latest
+npm update -g
+
+# python
+# first: find out the current python3 version in homebrew
+# then install this version with pyenv and link it
+brew install pyenv # restart terminal, then:
+pyenv install 3.9.2
+pyenv global 3.9.2
+pip install --upgrade pip
+mkdir /usr/local/Cellar/python@3.9
+ln -s ~/.pyenv/versions/3.9.2 /usr/local/Cellar/python@3.9/3.9.2_2
+brew link --overwrite python@3.9

install/2_cli-tools.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env zsh
+
+brew tap homebrew/services
+brew tap homebrew-ffmpeg/ffmpeg
+
+# install additional brew packages -- see _install.sh too
+brew install clipper
+brew install fzf
+brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac
+brew install htop
+brew install jump
+brew install nnn
+brew install ripgrep
+brew install switchaudio-osx
+brew install tree
+
+# node cli tools and helpers
+npm install -g diff-so-fancy
+npm install -g fkill-cli
+npm install -g npm-check
+npm install -g pure-prompt
+npm install -g yarn
+
+# install fzf
+/usr/local/opt/fzf/install
+
+# clipper
+mkdir -p ~/Library/LaunchAgents
+brew services start clipper
+
+# nnn plugins + trash-cli
+curl -Ls https://raw.githubusercontent.com/jarun/nnn/master/plugins/getplugs | sh

install/3_vimux.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env zsh
+
+brew install neovim
+brew install tmux
+
+# vim dependencies
+gem install neovim
+pip install neovim
+npm install -g neovim
+
+# link config files
+ln -s ~/dotfiles/nvim ~/.config/nvim
+ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
+
+# vim and tmux plugin managers
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+sh -c 'curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+
+vim +PlugInstall
+vim +CocInstall\ coc-calc\ coc-css\ coc-eslint\ coc-html\ coc-json\ coc-markdownlint\ coc-pairs\ coc-phpls\ coc-snippets\ coc-stylelintplus\ coc-tsserver\ coc-yaml\ coc-yank
+vim +CocUpdate +PlugUpgrade +PlugUpdate
+vim +checkhealth

install/4_office.sh

@@ -12,14 +12,22 @@ brew install w3m
 brew install vdirsyncer
 
 # python dependencies (for mutt)
-sudo pip3 install -I urlscan
+pip install urlscan
 
+# create folders
 mkdir ~/Contacts
 mkdir ~/Mail
 mkdir ~/Mail/mailbox
 mkdir ~/Mail/viu
+mkdir ~/Mail/===================
+
+# link config files
 ln -s ~/dotfiles/office/mutt ~/.mutt
 ln -s ~/dotfiles/office/mbsyncrc ~/.mbsyncrc
 ln -s ~/dotfiles/office/msmtprc ~/.msmtprc
 ln -s ~/dotfiles/office/khard ~/.config/khard
 ln -s ~/dotfiles/office/vdirsyncer ~/.vdirsyncer
+
+# now: create the correct keychain-entries in system keychain
+# for the mailboxes (compare msmtp/mbsync-config) and start
+# the first sync with "O". Usually install 1password first ;)

install/5_webdev.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env zsh
+
+brew reinstall dnsmasq
+brew reinstall httpd
+brew reinstall imagemagick
+brew reinstall mariadb
+brew reinstall mkcert
+brew reinstall nss
+brew reinstall php@7.4
+
+# dnsmasq
+echo 'address=/.localhost/127.0.0.1' > /usr/local/etc/dnsmasq.conf
+sudo brew services start dnsmasq
+sudo mkdir -v /etc/resolver
+sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/localhost'
+
+# php and ssl
+brew link php@7.4
+pecl install imagick
+mkcert -install
+mkcert localhost "dev.localhost" "*.dev.localhost"
+
+# now move those pem-files to their correct location

install/6_software.sh

@@ -3,7 +3,7 @@ brew tap buo/cask-upgrade
 brew tap homebrew/cask-fonts
 
 brew install --cask 1password
-brew install --cask adoptopenjdk8
+brew install --cask adoptopenjdk/openjdk/adoptopenjdk8
 brew install --cask alfred
 brew install --cask carbon-copy-cloner
 brew install --cask dash
@@ -14,6 +14,7 @@ brew install --cask hammerspoon
 brew install --cask imagealpha
 brew install --cask imageoptim
 brew install --cask iterm2
+brew install --cask kap
 brew install --cask karabiner-elements
 brew install --cask microsoft-teams
 brew install --cask numi
@@ -25,6 +26,11 @@ brew install --cask spotify
 brew install --cask telegram
 brew install --cask vlc
 brew install --cask vmware-fusion
+brew install --cask zoom
+
+# link config files for some casks
+ln -s ~/dotfiles/hammerspoon ~/.hammerspoon
+ln -s ~/dotfiles/karabiner ~/.config/karabiner
 
 # Drivers and other software
 brew install --cask font-fira-code

install/cli-tools.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-brew tap homebrew-ffmpeg/ffmpeg
-
-# install additional brew packages -- see _install.sh too
-brew install clipper
-brew install curl
-brew install dnsmasq
-brew install fzf
-brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac
-brew install htop
-brew install httpd
-brew install imagemagick
-brew install jump
-brew install mariadb
-brew install mkcert
-brew install neovim
-brew install nnn
-brew install nss
-brew install openssl
-brew install php@7.4
-brew install ripgrep
-brew install switchaudio-osx
-brew install tmux
-brew install trash-cli
-brew install tree
-
-# install fzf
-/usr/local/opt/fzf/install
-
-# clipper
-mkdir -p ~/Library/LaunchAgents
-brew services start clipper
-
-# vim stuff
-gem install neovim
-easy_install --user pip
-python -m pip install --user neovim
-pip3 install neovim
-
-curl -Ls https://raw.githubusercontent.com/jarun/nnn/master/plugins/getplugs | sh
-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-sh -c 'curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-
-# dnsmasq
-echo 'address=/.localhost/127.0.0.1' > /usr/local/etc/dnsmasq.conf
-sudo brew services start dnsmasq
-sudo mkdir -v /etc/resolver
-sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/localhost'
-
-# php and ssl
-pecl install imagick
-mkcert -install
-mkcert localhost "dev.localhost" "*.dev.localhost"

install/node.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env zsh
-curl -L https://git.io/n-install | bash
-
-npm install -g npm@latest
-npm update -g
-
-npm install -g diff-so-fancy
-npm install -g fkill-cli
-npm install -g neovim
-npm install -g npm-check
-npm install -g pure-prompt
-npm install -g yarn

karabiner/karabiner.json

@@ -133,6 +133,19 @@
                     "ignore": false,
                     "manipulate_caps_lock_led": false,
                     "simple_modifications": []
+                },
+                {
+                    "disable_built_in_keyboard_if_exists": true,
+                    "fn_function_keys": [],
+                    "identifiers": {
+                        "is_keyboard": true,
+                        "is_pointing_device": false,
+                        "product_id": 0,
+                        "vendor_id": 0
+                    },
+                    "ignore": false,
+                    "manipulate_caps_lock_led": false,
+                    "simple_modifications": []
                 }
             ],
             "fn_function_keys": [
@@ -140,97 +153,121 @@
                     "from": {
                         "key_code": "f1"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "display_brightness_decrement"
+                        {
-                    }
+                            "key_code": "display_brightness_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f2"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "display_brightness_increment"
+                        {
-                    }
+                            "key_code": "display_brightness_increment"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f3"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "mission_control"
+                        {
-                    }
+                            "key_code": "mission_control"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f4"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "launchpad"
+                        {
-                    }
+                            "key_code": "launchpad"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f5"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "illumination_decrement"
+                        {
-                    }
+                            "key_code": "illumination_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f6"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "illumination_increment"
+                        {
-                    }
+                            "key_code": "illumination_increment"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f7"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "rewind"
+                        {
-                    }
+                            "key_code": "rewind"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f8"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "play_or_pause"
+                        {
-                    }
+                            "key_code": "play_or_pause"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f9"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "fastforward"
+                        {
-                    }
+                            "key_code": "fastforward"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f10"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "mute"
+                        {
-                    }
+                            "key_code": "mute"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f11"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "volume_decrement"
+                        {
-                    }
+                            "key_code": "volume_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f12"
                     },
-                    "to": {
+                    "to": [
-                        "key_code": "volume_increment"
+                        {
-                    }
+                            "key_code": "volume_increment"
+                        }
+                    ]
                 }
             ],
             "name": "Default profile",
@@ -242,6 +279,7 @@
             "virtual_hid_keyboard": {
                 "caps_lock_delay_milliseconds": 0,
                 "country_code": 0,
+                "indicate_sticky_modifier_keys_state": true,
                 "keyboard_type": "ansi",
                 "mouse_key_xy_scale": 100
             }

nvim/coc-settings.json

@@ -3,16 +3,16 @@
 // coc-calc
 // coc-css
 // coc-eslint
-// coc-html Current version 1.4.1 is up to date.
+// coc-html
-// coc-json Current version 1.3.3 is up to date.
+// coc-json
-// coc-markdownlint Current version 1.10.1 is up to date.
+// coc-markdownlint
-// coc-pairs Current version 1.2.22 is up to date.
+// coc-pairs
-// coc-phpls Current version 2.2.0 is up to date.
+// coc-phpls
-// coc-snippets Current version 2.4.0 is up to date.
+// coc-snippets
-// coc-stylelintplus Current version 1.4.0 is up to date.
+// coc-stylelintplus
-// coc-tsserver Current version 1.6.7 is up to date.
+// coc-tsserver
-// coc-yaml Current version 1.3.0 is up to date.
+// coc-yaml
-// coc-yank Current version 1.2.0 is up to date.
+// coc-yank
 
 {
   "coc.preferences.formatOnSaveFiletypes": [

other/gruvbox-dark.scss

@@ -1,38 +0,0 @@
-// ----------------------------------------------------------------------------
-// Dark Mode
-// ----------------------------------------------------------------------------
-
-// Dark Background
-$gb-dm-bg0: #282828;
-$gb-dm-bg0-hard: #1d2021;
-$gb-dm-bg0-soft: #32302f;
-$gb-dm-bg1: #3c3836;
-$gb-dm-bg2: #504945;
-$gb-dm-bg3: #665c54;
-$gb-dm-bg4: #7c6f64;
-
-// Dark Foreground
-$gb-dm-fg0: #fbf1c7;
-$gb-dm-fg1: #ebdbb2;
-$gb-dm-fg2: #d5c4a1;
-$gb-dm-fg3: #bdae93;
-$gb-dm-fg4: #a89984;
-
-// Dark Colors
-$gb-dm-dark-red: #cc241d;
-$gb-dm-dark-green: #98971a;
-$gb-dm-dark-yellow: #d79921;
-$gb-dm-dark-blue: #458588;
-$gb-dm-dark-purple: #b16286;
-$gb-dm-dark-aqua: #689d6a;
-$gb-dm-dark-orange: #d65d0e;
-$gb-dm-dark-gray: #928374;
-
-$gb-dm-light-red: #fb4934;
-$gb-dm-light-green: #b8bb26;
-$gb-dm-light-yellow: #fabd2f;
-$gb-dm-light-blue: #83a598;
-$gb-dm-light-purple: #d3869b;
-$gb-dm-light-aqua: #8ec07c;
-$gb-dm-light-orange: #f38019;
-$gb-dm-light-gray: #a89984;

zsh/exports

@@ -56,7 +56,7 @@ export NNN_OPTS='deHR'
 export NNN_BMS='d:~/Dotfiles;s:~/Sites;l:~/Downloads;h:~/'
 export NNN_FCOLORS='c1e26c2e006033f5c6d6abc4'
 export NNN_FIFO='/tmp/nnn.fifo'
-export NNN_TRASH=1
+export NNN_TRASH=0
 export NNN_PLUG='o:fzcd;j:autojump;p:preview-tui'
 export NNN_ARCHIVE="\\.(7z|bz|bz2|gz|rar|rpm|tar|tgz|zip)$"
 

zsh/zsh-completions

@@ -1 +1 @@
-Subproject commit aa98bc593fee3fbdaf1acedc42a142f3c4134079
+Subproject commit f1ab6110ced9b5451e2125214497fedd270414c7

zsh/zsh-syntax-highlighting

@@ -1 +1 @@
-Subproject commit 205bc7ea199cfd4cded51d465baad63b3d7f3aad
+Subproject commit e8517244f7d2ae4f9d979faf94608d6e4a74a73e

zsh/zshrc

@@ -55,12 +55,11 @@ zle -N self-insert url-quote-magic
 # source some zsh plugins
 source $HOME/dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source $HOME/dotfiles/zsh/zsh-completions/zsh-completions.plugin.zsh
+# zsh-completions
+fpath=($HOME/dotfiles/zsh/zsh-completions/src $fpath)
 
-# fzf
+# other tools init
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-# jump
 eval "$(jump shell)"
-
+eval "$(rbenv init -)"
-# zsh-completions
+eval "$(pyenv init -)"
-fpath=($HOME/dotfiles/zsh/zsh-completions/src $fpath)