Fixes here and there...

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

4 files changed, 32 insertions, 32 deletions

diff --git a/.i3/config b/.i3/config
index 0d4ef8c..1b62bd3 100644
--- a/.i3/config
+++ b/.i3/config
@@ -170,7 +170,7 @@ bar {
   position top
   status_command ~/bin/i3status.sh
   workspace_buttons yes
-  tray_output DP-1
+  tray_output DVI-I-1
 
   colors {
     separator #666666
@@ -188,7 +188,7 @@ bar {
   position top
   status_command ~/bin/i3status.sh
   workspace_buttons yes
-  tray_output DP-1
+  tray_output DVI-I-1
 
   colors {
     separator #666666
diff --git a/.mbsyncrc b/.mbsyncrc
index 01ae168..4f64f7c 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -95,9 +95,9 @@ SyncState *
 IMAPAccount susecom
 Host outlook.office365.com
 User msabate@suse.com
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mbsyncpasssusecom.gpg"
+PassCmd "~/bin/mutt_oauth2.py ~/.mail/susecom/sessionfile"
 SSLType IMAPS
-AuthMechs Login
+AuthMechs XOAUTH2
 CertificateFile /etc/ssl/ca-bundle.pem
 Timeout 0
 
diff --git a/.tmux.conf b/.tmux.conf
index 70e483b..44fd8a7 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -34,8 +34,8 @@ unbind [
 bind Escape copy-mode
 unbind p
 bind p paste-buffer
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'y' send -X copy-selection
 
 
 # move tmux copy buffer into x clipboard
@@ -88,31 +88,31 @@ setw -g pane-base-index 1
 #
 # ui: shamelessly taken from: https://github.com/magarcia/dotfiles
 #
-set -g status-bg "colour0"
-set -g message-command-fg "colour15"
-set -g status-justify "left"
-set -g status-left-length "100"
-set -g status "on"
-set -g pane-active-border-fg "colour10"
-set -g message-bg "colour8"
-set -g status-right-length "100"
-set -g status-right-attr "none"
-set -g message-fg "colour15"
-set -g message-command-bg "colour8"
-set -g status-attr "none"
-set -g pane-border-fg "colour8"
-set -g status-left-attr "none"
-setw -g window-status-fg "colour7"
-setw -g window-status-attr "none"
-setw -g window-status-activity-bg "colour0"
-setw -g window-status-activity-attr "none"
-setw -g window-status-activity-fg "colour10"
-setw -g window-status-separator ""
-setw -g window-status-bg "colour0"
-set -g status-left "#[fg=colour234,bg=colour10] #S #[fg=colour10,bg=colour0,nobold,nounderscore,noitalics]▓▒░"
-set -g status-right "#[fg=colour7,bg=colour0,nobold,nounderscore,noitalics]░▒▓#[fg=colour234,bg=colour7] %Y-%m-%d | %H:%M #[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]░▒▓#[fg=colour234,bg=colour7] #h "
-setw -g window-status-format "#[fg=colour7,bg=colour0] #I |#[fg=colour7,bg=colour0] #W "
-setw -g window-status-current-format "#[fg=colour0,bg=colour8,nobold,nounderscore,noitalics]▓▒░#[fg=colour15,bg=colour8] #I |#[fg=colour15,bg=colour8] #W #[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]▓▒░"
+#set -g status-bg "colour0"
+#set -g message-command-fg "colour15"
+#set -g status-justify "left"
+#set -g status-left-length "100"
+#set -g status "on"
+#set -g pane-active-border-fg "colour10"
+#set -g message-bg "colour8"
+#set -g status-right-length "100"
+#set -g status-right-attr "none"
+#set -g message-fg "colour15"
+#set -g message-command-bg "colour8"
+#set -g status-attr "none"
+#set -g pane-border-fg "colour8"
+#set -g status-left-attr "none"
+#setw -g window-status-fg "colour7"
+#setw -g window-status-attr "none"
+#setw -g window-status-activity-bg "colour0"
+#setw -g window-status-activity-attr "none"
+#setw -g window-status-activity-fg "colour10"
+#setw -g window-status-separator ""
+#setw -g window-status-bg "colour0"
+#set -g status-left "#[fg=colour234,bg=colour10] #S #[fg=colour10,bg=colour0,nobold,nounderscore,noitalics]▓▒░"
+#set -g status-right "#[fg=colour7,bg=colour0,nobold,nounderscore,noitalics]░▒▓#[fg=colour234,bg=colour7] %Y-%m-%d | %H:%M #[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]░▒▓#[fg=colour234,bg=colour7] #h "
+#setw -g window-status-format "#[fg=colour7,bg=colour0] #I |#[fg=colour7,bg=colour0] #W "
+#setw -g window-status-current-format "#[fg=colour0,bg=colour8,nobold,nounderscore,noitalics]▓▒░#[fg=colour15,bg=colour8] #I |#[fg=colour15,bg=colour8] #W #[fg=colour8,bg=colour0,nobold,nounderscore,noitalics]▓▒░"
 
 # coping inside tmux
 bind c copy-mode
diff --git a/bin/vpnsetup b/bin/vpnsetup
index 8faf879..e131d8d 100755
--- a/bin/vpnsetup
+++ b/bin/vpnsetup
@@ -15,7 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-set -e
+set -ex
 
 # Show the help message.
 __vpnsetup_help() {