Makefile

@@ -1,4 +1,4 @@
-FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc \
+FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc liquidpromptrc \
 	neomuttrc pentadactylrc mailcap latexmkrc ctags \
 	i3/config i3status.conf config/dunst/dunstrc msmtprc spacemacs emacs.d mbsyncrc authinfo \
 	config/qutebrowser config/nvim/init.vim config/nvim/ginit.vim config/nvim/lua ideavimrc \

bashrc

@@ -14,7 +14,7 @@ HISTFILE=~/.bash_history
 shopt -s histappend
 
 PROMPT_COMMAND="history -a; history -c; history -r"
-type -t starship >/dev/null && eval "$(starship init bash)"
+. ~/etc/liquidprompt/liquidprompt
 
 shopt -s autocd
 shopt -s globstar
@@ -31,4 +31,4 @@ if type -t __git_complete >/dev/null; then
   __git_complete gp _git_push
 fi
 
-test -f /usr/share/fzf/shell/key-bindings.bash && . /usr/share/fzf/shell/key-bindings.bash
+test -f ~/.fzf/shell/key-bindings.bash && . ~/.fzf/shell/key-bindings.bash

commonshrc

@@ -10,15 +10,17 @@ alias ls='ls --color=auto'
 export EMAIL='gebner@gebner.org'
 test -x /usr/bin/lesspipe && eval `lesspipe`
 
-if type -t nvim >/dev/null; then
+export MPD_HOST=127.0.0.1 MPD_PORT=6600
-  export EDITOR="$(command -v nvim)"
+
-  alias vi="$EDITOR"
+export EDITOR="`which nvim || which vim || which vi`"
-fi
+alias vi="$EDITOR"
 
 export BROWSER=xdg-open
 
 alias udetokei='tokei $(rg --files)'
 
+alias time=$(which time)
+
 # passc
 passc() {
   pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c)

liquidprompt

@@ -0,0 +1 @@
+Subproject commit d5af671ec40957d4a05f4713c036da74041cc8c2

liquidpromptrc

@@ -0,0 +1,155 @@
+
+####################################
+# LIQUID PROMPT CONFIGURATION FILE #
+####################################
+
+# If you want to use different themes and features,
+# you can load the corresponding files here:
+source ~/etc/liquid.theme
+LP_PS1_FILE=~/etc/liquid.ps1
+
+#############
+# BEHAVIOUR #
+#############
+
+# Maximal value under which the battery level is displayed
+# Recommended value is 75
+LP_BATTERY_THRESHOLD=75
+
+# Minimal value after which the load average is displayed
+# Recommended value is 60
+LP_LOAD_THRESHOLD=60
+
+# Minimal value after which the temperature is displayed (in degrees Celsius)
+# Recommended value is 60
+LP_TEMP_THRESHOLD=60
+
+# The maximum percentage of the screen width used to display the path
+# Recommended value is 35
+LP_PATH_LENGTH=35
+
+# How many directories to keep at the beginning of a shortened path
+# Recommended value is 2
+LP_PATH_KEEP=2
+
+# Do you want to display the hostname, even if not connected through network?
+# Defaults to 0 (do not display hostname when locally connected)
+# set to 1 if you want to always see the hostname
+# set to -1 if you want to never see the hostname
+LP_HOSTNAME_ALWAYS=0
+
+# Use the FQDN instead of the short hostname if the hostname is displayed
+LP_ENABLE_FQDN=0
+
+# Do you want to display the user, even if the user is the same as the one logged in?
+# Defaults to 1 (always display the user)
+# set to 0 if you want to hide the logged user (it will always display different users)
+LP_USER_ALWAYS=1
+
+# Do you want to display the percentages of load/batteries along with their
+# corresponding marks? Set to 0 to only print the colored marks.
+# Defaults to 1 (display percentages)
+LP_PERCENTS_ALWAYS=1
+
+# Do you want to use the permissions feature?
+# Recommended value is 1
+LP_ENABLE_PERM=1
+
+# Do you want to use the shorten path feature?
+# Recommended value is 1
+LP_ENABLE_SHORTEN_PATH=1
+
+# Do you want to use the proxy detection feature?
+# Recommended value is 1
+LP_ENABLE_PROXY=1
+
+# Do you want to use the jobs feature?
+# Recommended value is 1
+LP_ENABLE_JOBS=1
+
+# Do you want to use the load feature?
+# Recommended value is 1
+LP_ENABLE_LOAD=1
+
+# Do you want to use the battery feature?
+# Recommended value is 1
+LP_ENABLE_BATT=1
+
+# Do you want to use the 'sudo credentials' feature?
+# Be warned that this may pollute the syslog if you don't have sudo
+# credentials, and the sysadmin will hate you.
+LP_ENABLE_SUDO=0
+
+# Do you want to use VCS features with the root account?
+# Recommended value is 0
+LP_ENABLE_VCS_ROOT=0
+
+# Do you want to use the Git special features?
+# Recommended value is 1
+LP_ENABLE_GIT=1
+
+# Do you want to use the Subversion special features?
+# Recommended value is 1
+LP_ENABLE_SVN=1
+
+# Do you want to use the Mercurial special features?
+# Recommended value is 1
+LP_ENABLE_HG=1
+
+# Do you want to use the Fossil special features?
+# Recommended value is 1
+LP_ENABLE_FOSSIL=1
+
+# Do you want to use the Bazaar special features?
+# Recommanded value is 1
+LP_ENABLE_BZR=1
+
+# Show time of the last prompt display
+# Recommended value is 0
+LP_ENABLE_TIME=0
+
+# Show runtime of the last command if over LP_RUNTIME_THRESHOLD
+# Recommended value is 0
+LP_ENABLE_RUNTIME=0
+
+# Minimal runtime to be displayed
+# Recommended value is 2
+LP_RUNTIME_THRESHOLD=2
+
+# Display the virtualenv that is currently activated, if any
+# Recommended value is 1
+LP_ENABLE_VIRTUALENV=1
+
+# Display the enabled software collections, if any
+# Recommended value is 1
+LP_ENABLE_SCLS=1
+
+# Show average system temperature
+LP_ENABLE_TEMP=0
+
+# When showing time, use an analog clock instead of numeric values.
+# The analog clock is "accurate" to the nearest half hour.
+# You must have a unicode-capable terminal and a font with the "CLOCK"
+# characters.
+# Recommended value is 0
+LP_TIME_ANALOG=0
+
+# Use the prompt as the title of the terminal window
+# The content is not customizable, the implementation is very basic,
+# and this may not work properly on exotic terminals, thus the
+# recommended value is 0
+# See LP_TITLE_OPEN and LP_TITLE_CLOSE to change escape characters to adapt this
+# feature to your specific terminal.
+LP_ENABLE_TITLE=1
+
+# Enable Title for screen and byobu
+LP_ENABLE_SCREEN_TITLE=1
+
+# Use differents colors for differents hosts you SSH in
+LP_ENABLE_SSH_COLORS=0
+
+# Specify a list of complete and colon (":") separated paths in which, all vcs
+# will be disabled
+LP_DISABLED_VCS_PATH=""
+
+# vim: set et sts=4 sw=4 tw=120 ft=sh:

oh-my-zsh

@@ -0,0 +1 @@
+Subproject commit d744c841d99c273c59e87d2a7115b87f58b5f7d6

vimrc

@@ -310,7 +310,7 @@ local luadev = require("neodev").setup({
 local lspconfig = require('lspconfig')
 lspconfig.lua_ls.setup(luadev)
 lspconfig.ccls.setup{}
-lspconfig.pylsp.setup{}
+lspconfig.pyright.setup{}
 lspconfig.tsserver.setup{}
 lspconfig.texlab.setup{}
 

zshrc

@@ -5,8 +5,17 @@
 # nix
 fpath+=(/run/current-system/sw/share/zsh/site-functions)
 
+# oh-my-zsh
+export ZSH=$HOME/etc/oh-my-zsh
+
+export ZSH_THEME=gebner
+export DISABLE_AUTO_UPDATE=true
+
 plugins=(git svn-fast-info mercurial cabal gem perl rails ruby)
 
+source $ZSH/oh-my-zsh.sh
+unset GREP_OPTIONS    # oh-my-zsh breaks grep...
+
 setopt nocorrect_all
 alias ll=ll   # lojban lookup
 alias gm=gm   # graphicsmagick