Merge branch 'cadscan' (early part)

diff --cc qutebrowser/qutebrowser.conf
index a68065e7f0ab47b3d6c1f15e3c263a5a9d85adb7,b14fedbec44c52115762f41e249e259d5de0b3e6..d1c56d30f2ac60d466176194cb58f712f8b53cf5
--- 1/qutebrowser/qutebrowser.conf
--- 2/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/qutebrowser.conf
@@@ -923,8 -883,7 +923,8 @@@ webgl = tru
  css-regions = true
  hyperlink-auditing = false
  geolocation = ask
- notifications = ask
+ notifications = false
 +media-capture = ask
  javascript-can-open-windows-automatically = false
  javascript-can-close-windows = false
  javascript-can-access-clipboard = false

diff --cc systemd/user/ssh-agent.service
index 08b7dcb76ad7d1aa3ffd57f88cdfa70ffd435cfc,8a1d157ed9e9ab845a978e1de9b42bfcf7bb2668..df24fe9fa7cb636378584fc25f5c5564177a25ba
--- 1/systemd/user/ssh-agent.service
--- 2/systemd/user/ssh-agent.service
+++ b/systemd/user/ssh-agent.service
@@@ -3,8 -3,8 +3,8 @@@ Description=SSH key agen
  
  [Service]
  Type=forking
- Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ PassEnvironment=SSH_AUTH_SOCK
 -ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
 +ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK -t 1h
  
  [Install]
  WantedBy=default.target

diff --cc vim/ftplugin/cpp.vim
Simple merge

diff --cc vim/vimrc
Simple merge

diff --cc zshenv
index b3ce2e5ee2be18853e34b65c5b9bba733620adb2,91840401ef4e471d3c5ac2655dcc33f546641db3..b161335c19f289bb6a6f53f19e93100f3d90ece9
--- 1/zshenv
--- 2/zshenv
+++ b/zshenv
@@@ -5,15 -5,15 +5,18 @@@ export XDG_DATA_HOME="$HOME/.local/shar
  export XDG_CACHE_HOME="$HOME/.cache"
  export HOST=$(hostname)
  
 +# gpg
 +export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+ # ssh
+ export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
  
  if hash systemctl 2>/dev/null; then
      systemctl --user import-environment \
          XDG_CACHE_HOME \
          XDG_CONFIG_HOME \
          XDG_DATA_HOME \
-         GNUPGHOME
++        GNUPGHOME \
+         SSH_AUTH_SOCK
  fi
  
  # vim stuff