zsh: Remove GOPATH

Should also have been removed long ago

.gitmodules

@@ -19,3 +19,7 @@
 [submodule "zsh-nix-shell"]
 	path = zsh-nix-shell
 	url = https://github.com/chisui/zsh-nix-shell
+[submodule "mpv-prescalers"]
+	path = mpv-prescalers
+	url = https://github.com/bjin/mpv-prescalers
+	shallow = true

home/.XCompose

@@ -74,17 +74,6 @@ include "%L"
 <Multi_key> <percent> <0> <0> <D>           : "ↇ"   U2187       # ROMAN NUMERAL FIFTY THOUSAND
 <Multi_key> <percent> <0> <0> <M>           : "ↈ"   U2188       # ROMAN NUMERAL ONE HUNDRED THOUSAND
 
-## quotation marks
-### japanese
-
-<Multi_key> <j> <doublelowquotemark>  : "「" U300C # LEFT CORNER BRACKET
-<Multi_key> <j> <leftdoublequotemark> : "」" U300D # RIGHT CORNER BRACKET
-<Multi_key> <j> <singlelowquotemark>  : "『" U300D # LEFT WHITE CORNER BRACKET
-<Multi_key> <j> <leftsinglequotemark> : "』" U300F # RIGHT WHITE CORNER BRACKET
-
-# misc symbols
-<Multi_key> <n> <s>                 : "卐"  U5350         # CJK UNIFIED IDEOGRAPH
-
 # symbols
 <Multi_key> <Left> <Left>           : "←"   leftarrow     # LEFTWARDS ARROW
 <Multi_key> <Up> <Up>               : "↑"   uparrow       # UPWARDS ARROW

home/.config/khal/config

@@ -0,0 +1,16 @@
+[calendars]
+
+[[calendar_local]]
+path = ~/.calendar/*
+type = discover
+
+[[contacts_local]]
+path = ~/.contacts/d6abd3ea-3abd-7550-9f24-f06293d36a82/
+type = birthdays
+
+[locale]
+timeformat = %H:%M
+dateformat = %Y-%m-%d
+longdateformat = %Y-%m-%d
+datetimeformat = %Y-%m-%d %H:%M
+longdatetimeformat = %Y-%m-%d %H:%M

home/.config/khard/khard.conf

@@ -0,0 +1,26 @@
+[addressbooks]
+[[personal]]
+path = ~/.contacts/d6abd3ea-3abd-7550-9f24-f06293d36a82/
+
+[general]
+debug = no
+default_action = list
+editor = nvim, -i, NONE
+merge_editor = nvim, -d
+
+[contact table]
+display = first_name
+group_by_addressbook = no
+reverse = no
+show_nicknames = yes
+show_uids = no
+sort = last_name
+localize_dates = yes
+preferred_phone_number_type = pref, cell, home
+preferred_email_address_type = pref, home, work
+
+[vcard]
+private_objects = Jabber,
+preferred_version = 3.0
+search_in_source_files = no
+skip_unparsable = no

home/.config/mpv/input.conf

@@ -13,7 +13,10 @@ k cycle-values audio-pitch-correction "no" "yes"
 
 c cycle-values audio-channels stereo mono auto
 
-K cycle-values glsl-shaders ~~/shaders/ravu-lite-r4.hook ~~/shaders/ravu-lite-r3.hook ~~/shaders/ravu-lite-r2.hook /dev/null
+# Upscaling shaders
+K cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/ravu-lite-r4.hook ~~/shaders/mpv-prescalers/compute/ravu-lite-r3.hook ~~/shaders/mpv-prescalers/compute/ravu-lite-r2.hook /dev/null
+Alt+K cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/ravu-zoom-r4-yuv.hook ~~/shaders/mpv-prescalers/compute/ravu-zoom-r3-yuv.hook ~~/shaders/mpv-prescalers/compute/ravu-zoom-r2-yuv.hook /dev/null
+Alt+k cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/nnedi3-nns256-win8x4.hook ~~/shaders/mpv-prescalers/compute/nnedi3-nns128-win8x4.hook /dev/null
 
 Ctrl+p script-message-to pitchcontrol toggle
 

home/.config/mpv/mpv.conf

@@ -28,7 +28,7 @@ audio-channels = stereo
 force-seekable
 
 # enable hardware decoding when avaliable
-hwdec = vaapi
+hwdec = auto-safe
 
 # do not show images only one second
 image-display-duration = inf
@@ -40,7 +40,6 @@ dither-depth = auto
 
 # screenshots
 screenshot-format = png
-screenshot-directory = ~/Videos/screenshots/unsorted/
 
 [musicvideo]
 lavfi-complex = '[aid1]asplit=4[ao][a1][a2][a3];[a1]avectorscope=m=lissajous:s=640x600:draw=dot:r=25[avectorscope];[a2]aresample=44100,showwaves=s=1280x600:mode=p2p:colors=red|lightgreen:r=25[showwaves];[a3]showcqt=s=1920x600:axis=0:axis_h=0:r=25[showcqt];[showwaves][avectorscope]hstack=shortest=1[top];[top][showcqt]vstack=shortest=1,fps=25[vo]'
@@ -68,6 +67,14 @@ scale = bicubic_fast
 cscale = bicubic_fast
 dscale = bicubic_fast
 
+[hq]
+scale = ewa_lanczossharp
+dscale = ewa_lanczossharp
+cscale = ewa_lanczossharp
+
+glsl-shader=~~/shaders/mpv-prescalers/compute/nnedi3-nns256-win8x4.hook
+glsl-shader=~~/shaders/mpv-prescalers/compute/ravu-zoom-r4-chroma.hook
+
 [interpolate]
 blend-subtitles = yes
 video-sync = display-resample

home/.config/mpv/shaders/mpv-prescalers

@@ -0,0 +1 @@
+../../../../mpv-prescalers

home/.config/nvim/init.vim

@@ -43,8 +43,9 @@ endif
 call plug#begin('~/.local/share/nvim/plugged')
 
 " Multi-entry selection UI
-Plug 'junegunn/fzf'
-Plug 'junegunn/fzf.vim'
+Plug 'junegunn/fzf', { 'tag': trim(system('fzf --version')) }
+" FIXME: update once nixpkgs stable has fzf ≥ 0.23
+Plug 'junegunn/fzf.vim', { 'commit': '0fe8e198a3a501b54dbc4f9587526c097599f95a' }
 
 " Per-project settings
 Plug 'editorconfig/editorconfig-vim'
@@ -86,6 +87,9 @@ Plug 'Xuyuanp/nerdtree-git-plugin'
 " Icons for NERDTree and airline
 Plug 'ryanoasis/vim-devicons'
 
+" Git integration
+Plug 'tpope/vim-fugitive'
+
 " Intra word motion
 Plug 'chaoren/vim-wordmotion'
 
@@ -107,11 +111,12 @@ Plug 'autozimu/LanguageClient-neovim', {
     \ }
 
 let g:LanguageClient_serverCommands = {
-    \ 'rust': ['rustup', 'run', 'stable', 'rls'],
-    \ 'go': ['gopls'],
-    \ 'python': ['pyls'],
-    \ 'typescript': ['docker', 'run', '--rm', '--init', '-i', '-v', '$HOME:$HOME:ro', '--network=none', 'r.sbruder.de/javascript-typescript-langserver'],
-    \ 'javascript': ['docker', 'run', '--rm', '--init', '-i', '-v', '$HOME:$HOME:ro', '--network=none', 'r.sbruder.de/javascript-typescript-langserver'],
+    \ 'rust': ['nix-shell', '--quiet', '-p', 'rls', '--run', 'rls'],
+    \ 'go': ['nix-shell', '--quiet', '-p', 'gopls', '--run', 'gopls'],
+    \ 'python': ['nix-shell', '--quiet', '-p', 'python38Packages.python-language-server', '--run', 'pyls'],
+    \ 'typescript': ['nix-shell', '--quiet', '-p', 'nodePackages.javascript-typescript-langserver', '--run', 'javascript-typescript-stdio'],
+    \ 'javascript': ['nix-shell', '--quiet', '-p', 'nodePackages.javascript-typescript-langserver', '--run', 'javascript-typescript-stdio'],
+    \ 'haskell': ['nix-shell', '--quiet', '-p', 'haskellPackages.haskell-language-server', '--run', 'haskell-language-server --lsp'],
     \ }
 
 let g:LanguageClient_loggingFile = '~/.local/share/nvim/LanguageClient.log'
@@ -136,7 +141,7 @@ let g:rust_fold = 1
 map <Leader>rt :RustTest<CR>
 
 " Black (python formatter)
-Plug 'psf/black', { 'branch': 'stable', 'for': 'python' }
+Plug 'psf/black', { 'commit': '1d3fb871bec82d1263940ba1d32095d660fea2ab', 'for': 'python' }
 
 " LaTeX helpers
 Plug 'lervag/vimtex'
@@ -151,6 +156,7 @@ let g:vimtex_syntax_autoload_packages = [
 let g:vimtex_quickfix_ignore_filters = [
   \'Underfull \\hbox (badness [0-9]*) in ',
   \'Overfull \\hbox ([0-9]*.[0-9]*pt too wide) in ',
+  \'Overfull \\vbox ([0-9]*.[0-9]*pt too high) detected ',
   \'Package hyperref Warning: Token not allowed in a PDF string',
   \'Package typearea Warning: Bad type area settings!',
   \]

home/.config/sway/config

@@ -146,6 +146,10 @@ bindsym --locked XF86MonBrightnessUp exec brightnessctl set +5%
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
 
+bindsym XF86AudioPrev exec mpc next
+bindsym XF86AudioNext exec mpc prev
+bindsym XF86AudioPlay exec mpc toggle
+
 bindsym $mod+y exec "swaylock -f -i $wallpaper"
 bindsym --locked $mod+q exec 'test $(swaymsg -t get_outputs | jq "[.[].dpms] | any") = "true" && swaymsg "output * dpms off" || swaymsg "output * dpms on"'
 

home/.config/waybar/config

@@ -117,7 +117,8 @@
     "format-linked": "{ifname} (No IP)  ",
     "format-disconnected": "Disconnected ⚠ ",
     "format-alt": "{ifname}: {ipaddr}/{cidr}",
-    "tooltip": false
+    "tooltip": false,
+    "on-click-right": "alacritty -e nmtui"
   },
   "network#speed": {
     "interval": 2,

home/.config/waybar/style.css

@@ -147,3 +147,7 @@ window#waybar {
 #custom-redshift.inactive {
   background-color: #268bd2;
 }
+
+#tray {
+  padding: 0 5px;
+}

home/.gitconfig

@@ -2,15 +2,35 @@
 	name = Simon Bruder
 	email = simon@sbruder.de
 	signingkey = 51276B7B829AF24674F2AA716F03E0000CC5B62F
+
 [commit]
 	gpgsign = true
+
 [core]
 	excludesfile = ~/.gitignore
+	pager = delta
 	quotepath = off
+
 [filter "lfs"]
 	process = git-lfs filter-process
 	required = true
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
+
 [pull]
 	ff = only
+
+[interactive]
+	diffFilter = delta --color-only
+
+[delta]
+	line-numbers = true
+	side-by-side = true
+	decorations = true
+	features = decorations
+	syntax-theme = base16
+
+[delta "decorations"]
+	commit-decoration-style = bold yellow box ul
+	file-style = bold yellow ul
+	file-decoration-style = none

home/.local/share/Anki2/addons21/ankisyncd/__init__.py

@@ -0,0 +1,13 @@
+import anki.sync
+import anki.hooks
+import aqt
+
+anki.sync.SYNC_BASE = "https://anki.sbruder.de/%s"
+anki.sync.SYNC_MEDIA_BASE = "https://anki.sbruder.de/msync%s"
+
+
+def resetHostNum():
+    aqt.mw.pm.profile["hostNum"] = None
+
+
+anki.hooks.addHook("profileLoaded", resetHostNum)

home/.xprofile

@@ -1,3 +0,0 @@
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus

home/.zshenv

@@ -1,11 +1,8 @@
-GOPATH="$HOME/go"
-
 path=(
     ~/bin
     ~/.local/bin
     $path
     ~/.cargo/bin
-    $GOPATH/bin
 )
 
 # Force antialiasing in java

home/.zshrc.docker

@@ -81,6 +81,7 @@ function vapoursynth() {
         --group-add $(getent group video|cut -d: -f3) \
         --group-add $(getent group render|cut -d: -f3) \
         --device /dev/dri \
+        --device /dev/kfd \
         r.sbruder.de/vapoursynth \
         $@
 }
@@ -96,6 +97,7 @@ function yuuno() {
         --group-add $(getent group video|cut -d: -f3) \
         --group-add $(getent group render|cut -d: -f3) \
         --device /dev/dri \
+        --device /dev/kfd \
         r.sbruder.de/vapoursynth \
         jupyter notebook --ip 0.0.0.0 --port 8087
 }

home/.zshrc.local

@@ -13,6 +13,10 @@ alias vim="nvim"
 alias vimdiff="nvim -d"
 alias userctl="systemctl --user"
 
+## homeshick
+source "$HOME/.homesick/repos/homeshick/homeshick.sh"
+fpath=($HOME/.homesick/repos/homeshick/completions $fpath)
+
 ## Debian packages fd as fdfind
 command -v fdfind >/dev/null && alias fd="fdfind"
 
@@ -99,7 +103,7 @@ function nixify() {
 { pkgs ? import <nixpkgs> {} }:
 
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
+  buildInputs = with pkgs; [
   ];
 }
 EOF

home/.zshrc.pre

@@ -1,7 +0,0 @@
-## homeshick
-source "$HOME/.homesick/repos/homeshick/homeshick.sh"
-fpath=($HOME/.homesick/repos/homeshick/completions $fpath)
-
-## completions
-mkdir -p ~/.zfunc
-fpath+=~/.zfunc

mpv-prescalers

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