From: Samir Benmendil <me@rmz.io>
Date: Sat, 1 Apr 2017 17:48:19 +0000 (+0100)
Subject: Merge branch 'cadscan' (early part)
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/172cfbb4b15794f9dd12a4531e6ba6b8f0edbb2a?ds=sidebyside

Merge branch 'cadscan' (early part)
---

172cfbb4b15794f9dd12a4531e6ba6b8f0edbb2a
diff --cc qutebrowser/qutebrowser.conf
index a68065e,b14fedb..d1c56d3
--- a/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 08b7dcb,8a1d157..df24fe9
--- a/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 zshenv
index b3ce2e5,9184040..b161335
--- a/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