Merge remote-tracking branch 'origin/master' into everard

2026-03-03 06:27:21 +01:00 · 2015-06-18 10:27:06 +02:00
parent 9f777a3dc1 5f3f98fa89
commit 728a883349
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -15,7 +15,7 @@ case $((hostname)) in

        pulseaudio --start

-        eval $(gpg-agent --daemon) &
+        eval $(gpg-agent --enable-ssh-support --daemon)

        xrdb $HOME/.Xresources

--- a/2
+++ b/2
@@ -6,7 +6,7 @@ antigen bundle gerges/oh-my-zsh-jira-plus

 antigen use oh-my-zsh

-antigen bundle command-not-found
+antigen bundle tmux
 antigen theme robbyrussell

 antigen apply