updating stuff

4 files changed, 53 insertions, 27 deletions

diff --git a/home/.gitconfig b/home/.gitconfig
index 6452b23..7986183 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -28,7 +28,7 @@
 	fixes = Fixes: %h (\"%s\")
 
 [pull]
-	rebase = preserve
+	rebase = true
 
 [push]
 	default = upstream
@@ -47,3 +47,5 @@
 [user]
 	email = astra@ionic.at
 	name = David Kaufmann
+[init]
+	defaultBranch = master
diff --git a/home/.mutt/muttrc b/home/.mutt/muttrc
index 7013450..56a88d9 100644
--- a/home/.mutt/muttrc
+++ b/home/.mutt/muttrc
@@ -385,7 +385,7 @@ auto_view text/html
 
 # but this will render all html, we only want to autoview it when we don't have
 # text/plain:
-alternative_order text/enriched text/plain text
+alternative_order text/plain text/enriched text/html text
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
diff --git a/home/.vim/vimrc b/home/.vim/vimrc
index 36d0ff7..e8a79cd 100644
--- a/home/.vim/vimrc
+++ b/home/.vim/vimrc
@@ -20,15 +20,16 @@ nmap <silent> <F11> :tabnext<CR>
 
 " http://www.pixelbeat.org/settings/.vimrc
 " Syntax Highlighting aktivieren
-"syntax enable " keep coloring
-syntax on " discard coloring
+syntax enable " keep coloring
+"syntax on " discard coloring
 
 " Display even non-printable chars.
 set binary
 
 let g:tex_fold_enabled=1
-filetype plugin on
-filetype indent on
+filetype plugin indent on
+"filetype plugin on
+"filetype indent on
 
 " Automatisch einruecken (Ausrichtung an voriger Zeile)
 " (STRG-T rueckt um 1 Stufe ein, STRG-D rueckt um 1 Stufe aus)
@@ -361,6 +362,8 @@ let g:vimtex_quickfix_latexlog = {
       \ },
       \}
 
+let g:rustfmt_autosave = 1
+
 " transparency: open colorscheme, replace "ctermbg=Color" with "ctermbg=NONE"
 
 retab
diff --git a/home/.zshrc b/home/.zshrc
index 8f2eb09..636e867 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -2,35 +2,40 @@
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-export ZSH="${HOME}/.oh-my-zsh"
+export ZSH=$HOME/.oh-my-zsh
 
-# Set name of the theme to load. Optionally, if you set this to "random"
-# it'll load a random theme each time that oh-my-zsh is loaded.
-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 ZSH_THEME="afowler"
 #ZSH_THEME="agnoster"
 #ZSH_THEME="bira"
 #ZSH_THEME="obraun"
 
-# Set list of themes to load
-# Setting this variable when ZSH_THEME=random
-# cause zsh load theme from this variable instead of
-# looking in ~/.oh-my-zsh/themes/
-# An empty array have no effect
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
 # ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
-# Uncomment the following line to use hyphen-insensitive completion. Case
-# sensitive completion must be off. _ and - will be interchangeable.
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment the following line to disable bi-weekly auto-update checks.
-DISABLE_AUTO_UPDATE="true"
+# Uncomment one of the following lines to change the auto-update behavior
+zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
 
 # Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
@@ -42,6 +47,9 @@ DISABLE_AUTO_UPDATE="true"
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
 # COMPLETION_WAITING_DOTS="true"
 
 # Uncomment the following line if you want to disable marking untracked files
@@ -51,14 +59,18 @@ DISABLE_AUTO_UPDATE="true"
 
 # Uncomment the following line if you want to change the command execution time
 # stamp shown in the history command output.
-# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
 # HIST_STAMPS="mm/dd/yyyy"
 
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
@@ -88,9 +100,6 @@ PROMPT='%{$fg[green]%}[%D{%T}]%{$reset_color%} %{$fg_no_bold[$USERNAMECOLOR]%}%n
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
 
-# ssh
-# export SSH_KEY_PATH="~/.ssh/rsa_id"
-
 # Set personal aliases, overriding those provided by oh-my-zsh libs,
 # plugins, and themes. Aliases can be placed here, though oh-my-zsh
 # users are encouraged to define aliases within the ZSH_CUSTOM folder.
@@ -144,6 +153,11 @@ if ! [[ $PATH =~ "${HOME}/bin" ]]; then
 	PATH="${HOME}/bin:${PATH}"
 fi
 
+# add ~/.local/bin to path
+if ! [[ $PATH =~ "${HOME}/.local/bin" ]]; then
+	PATH="${HOME}/.local/bin:${PATH}"
+fi
+
 # add ~/.cargo/bin to path
 if ! [[ $PATH =~ "${HOME}/.cargo/bin" ]]; then
 	PATH="${HOME}/.cargo/bin:${PATH}"
@@ -204,6 +218,7 @@ if main_node; then
 	alias openwlans='nmcli device wifi rescan ; sleep 2 ; nmcli device wifi list | egrep -v "(WPA1|WPA2|802.1X|WEP)" | grep -v Ad-Hoc | awk "!/^  --/ {print}"'
 	alias venv='source `find . -wholename "*/bin/activate" | head -n1`'
 	alias xclip='xclip -selection c'
+	alias fsinfcast='ffmpeg -f x11grab -i :0 -preset ultrafast -vcodec libx264 -tune zerolatency -b:v 1M -f mpegts udp://128.130.95.74:1234'
 fi
 
 if main_node; then
@@ -244,7 +259,7 @@ if main_node; then
 	}
 fi
 
-mping(){ ping $@|awk -F'[= ]' '/time=/{t=$(NF-1);f=2000-14*log(t^18);c="play -q -n synth 1 pl "f"&";print $0;system(c)}';} # mping yahoo\.com
+mping(){ ping $@|awk -F'[= ]' '/time=/{t=$(NF-1);f=2000-14*log(t^18);c="play -q -n synth 1 pl "f"&";print $0;system(c)}'; } # mping yahoo\.com
 bat(){
 	BAT0="/sys/class/power_supply/BAT0";
 	BAT1="/sys/class/power_supply/BAT1";
@@ -265,3 +280,9 @@ funcation vim() {
 		command vim $*
 	fi
 }
+
+yaml_lint(){ python3 -c 'import yaml, sys, pprint; pprint.pprint(yaml.safe_load(sys.stdin))'; }
+
+# auto-completion
+autoload -Uz compinit
+compinit