update local config

6 files changed, 36 insertions, 27 deletions

diff --git a/home/.config/neomutt/muttrc b/home/.config/neomutt/muttrc
index aaa1427..bc7e9a2 100644
--- a/home/.config/neomutt/muttrc
+++ b/home/.config/neomutt/muttrc
@@ -377,6 +377,7 @@ auto_view application/pgp-signature
 #auto_view application/x-troff-man
 #auto_view text/x-vcard
 auto_view text/html
+auto_view text/calendar
 
 # but this will render all html, we only want to autoview it when we don't have
 # text/plain:
diff --git a/home/.gitconfig b/home/.gitconfig
index 89ab7d6..1df6f13 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -1,6 +1,6 @@
 [alias]
 	dc = describe --contains
-	cf = !git status --porcelain | cut -d' ' -f3 | cut -d'/' -f1-4 | sort | uniq | xargs -n1 | xargs -I '{}' echo git commit -m '{}' -- {} | sh
+	cf = !git status -z --no-renames --untracked-files=no --porcelain=v1 | grep -zE "^[MAD]  " | cut -z -b 4- | cut -z -d'/' -f1-4 | sort -z | uniq -z | xargs -0 -I '{}' git commit -m '{}' -- '{}'
 	lg = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit
 	wdiff = diff --word-diff
 
@@ -22,9 +22,25 @@
 	abbrev = 12
 	autocrlf = input
 	excludesFile = /home/astra/.gitignore
+	pager = delta # delta
+
+[interactive] # delta
+	diffFilter = delta --color-only # delta
+
+[delta] # delta
+	navigate = true    # delta, use n and N to move between diff sections
+	light = false      # delta, set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+	line-numbers = true
+	#zero-style = dim syntax
+	zero-style = dim
+	max-line-length = 0
 
 [merge]
 	tool = meld
+	conflictstyle = diff3 # delta
+
+[diff] # delta
+	colorMoved = default # delta
 
 [pretty]
 	fixes = Fixes: %h (\"%s\")
@@ -52,3 +68,6 @@
 
 [init]
 	defaultBranch = master
+
+[includeIf "gitdir:~/git/tuit/"]
+	path = ~/git/tuit/.gitconfig
diff --git a/home/.mutt/muttrc b/home/.mutt/muttrc
index 828f119..c22f118 100644
--- a/home/.mutt/muttrc
+++ b/home/.mutt/muttrc
@@ -26,7 +26,6 @@ set abort_unmodified=yes	# automatically abort replies if I don't
 				# change the message
 #forgotten-attachment
 set abort_noattach = ask-yes
-set abort_noattach_regex = "\\<(anhängen|angehängt|anhang|anhänge|hängt an|attach(|ed|ments?))\\>"
 set alias_file=~/.mail_aliases	# where I keep my aliases
 set allow_8bit			# never do Q-P encoding on legal 8-bit chars
 set arrow_cursor		# use -> instead of hiliting the whole line
@@ -361,6 +360,7 @@ auto_view application/pgp-signature
 #auto_view application/x-troff-man
 #auto_view text/x-vcard
 auto_view text/html
+auto_view text/calendar
 
 # but this will render all html, we only want to autoview it when we don't have
 # text/plain:
diff --git a/home/.tmux.conf b/home/.tmux.conf
index 25840b9..097b522 100644
--- a/home/.tmux.conf
+++ b/home/.tmux.conf
@@ -70,6 +70,7 @@ bind-key -T copy-mode-vi -n S-NPage send-keys -X halfpage-down
 bind-key -T copy-mode -n / send-keys -X search-forward
 
 set-window-option -g aggressive-resize on
+set-window-option -g window-size smallest
 
 set-option -g renumber-windows on
 
diff --git a/home/.zprofile b/home/.zprofile
index 896061b..6a7226b 100644
--- a/home/.zprofile
+++ b/home/.zprofile
@@ -3,6 +3,10 @@ main_node() { [[ "$HOSTNAME" == "anduin" ]] }
 export XDG_CURRENT_DESKTOP=kde
 export GNOME_KEYRING_CONTROL=/run/user/1000/keyring
 
+export GTK_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=ibus
+
 export LANG='en_US.utf8'
 if [[ -x /usr/bin/locale ]]; then
 	local mylocale
diff --git a/home/.zshrc b/home/.zshrc
index 9380b90..38d8741 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -110,8 +110,8 @@ PROMPT='%{$fg[green]%}[%D{%T}]%{$reset_color%} %{$fg_no_bold[$USERNAMECOLOR]%}%n
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
 HISTFILE=~/.histfile
-HISTSIZE=65536
-SAVEHIST=65536
+HISTSIZE=1048576
+SAVEHIST=1048576
 eval `dircolors -b`
 
 # Timestamps in history
@@ -176,6 +176,7 @@ export LESS="-FRX"
 alias -g B='&> /dev/null &'
 
 export PYTHONSTARTUP=~/.pythonrc
+export DEBEMAIL="astra@ionic.at"
 
 if main_node; then
 	export BROWSER="firefox"
@@ -224,29 +225,8 @@ if main_node; then
 fi
 
 if main_node; then
-	# just press 'asdf' keys to toggle between dvorak and us keyboard layout
-	#asdf() {
-	#	echo -n 'Switching to us keyboard layout: '
-	#	[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
-	#	echo 'Done'
-	#}
-	# just press 'asdf' key to toggle from neo layout to us keyboard layout
-	#fdsa() {
-	#	echo -n 'Switching to de keyboard layout: '
-	#	[[ -z "$DISPLAY" ]] && $SUDO loadkeys de &>/dev/null || setxkbmap de &>/dev/null
-	#	echo 'Done'
-	#}
-	#
-	#neo() {
-	#	echo -n 'Switching to neo keyboard layout: '
-	#	[[ -z "$DISPLAY" ]] && $SUDO loadkeys de neo &>/dev/null || setxkbmap de neo -option &>/dev/null
-	#	echo 'Done'
-	#}
-	#eaiu() {
-	#	echo -n 'Switching to us keyboard layout: '
-	#	[[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
-	#	echo 'Done'
-	#}
+	monitor () { sh "${HOME}/.screenlayout/${1}.sh" 2>/dev/null || ( cd "${HOME}/.screenlayout" && ls -- *.sh | sed 's/.sh$//'; ) }
+
 	pdfpc() {
 		# disable dunst (notifications) and redshift (color tinting)
 		dunst_state=$(systemctl is-active --user dunst.service)
@@ -272,6 +252,10 @@ if main_node; then
 		ip -brief addr show
 		mpv udp://${ADDR}:${PORT} --no-cache --untimed --no-demuxer-thread --video-sync=audio --vd-lavc-threads=1
 	}
+
+	schauglasl () {
+		curl -s "https://icinga2.kom.tuwien.ac.at/schauglasl/routes?address=$1&context=tunet&best=1" | html2text --pad-tables | less
+	}
 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