From 386f9271125f93651cb20420de696efab8798fa9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@fretlink.com>
Date: Mon, 26 Nov 2018 22:57:25 +0100
Subject: [PATCH] Some fixes

- Firefox creates desktop dir unless a trailing / is added to
  XDG_DESKTOP_DIR
- LESS options
- evince option
- bashrc is loaded twice
- add gundo for vim
---
 roles/init/files/user_dirs/user-dirs.dirs  | 2 +-
 roles/init/templates/pam_environment.j2    | 1 +
 roles/shell/bash/templates/bash_profile.j2 | 3 ++-
 roles/tools/files/gio_unwrapper.sh         | 2 +-
 roles/tools/files/vimrc                    | 1 +
 roles/tools/tasks/main.yml                 | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/init/files/user_dirs/user-dirs.dirs b/roles/init/files/user_dirs/user-dirs.dirs
index fd59b25..0c320a4 100644
--- a/roles/init/files/user_dirs/user-dirs.dirs
+++ b/roles/init/files/user_dirs/user-dirs.dirs
@@ -5,7 +5,7 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME"
+XDG_DESKTOP_DIR="$HOME/"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_TEMPLATES_DIR="$HOME"
 XDG_PUBLICSHARE_DIR="$HOME"
diff --git a/roles/init/templates/pam_environment.j2 b/roles/init/templates/pam_environment.j2
index 422b98d..e75726c 100644
--- a/roles/init/templates/pam_environment.j2
+++ b/roles/init/templates/pam_environment.j2
@@ -47,6 +47,7 @@ SSH_AGENT_PID			DEFAULT=
 SSH_AUTH_SOCK			DEFAULT="${XDG_RUNTIME_DIR}/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent.ssh"
 
 # Less
+LESS				DEFAULT="-iqFMRSX"
 LESSHISTFILE			DEFAULT="${XDG_STATE_HOME}/less/history"
 
 # Pass
diff --git a/roles/shell/bash/templates/bash_profile.j2 b/roles/shell/bash/templates/bash_profile.j2
index f622f67..5be21a9 100644
--- a/roles/shell/bash/templates/bash_profile.j2
+++ b/roles/shell/bash/templates/bash_profile.j2
@@ -2,7 +2,8 @@
 # This file is loaded thanks to as line in /etc/profile
 # test "$BASH" && test -r "$XDG_CONFIG_HOME/bash/bash_profile" && . $XDG_CONFIG_HOME/bash/bash_profile
 
-[[ -f $XDG_CONFIG_HOME/bash/bashrc ]] && . $XDG_CONFIG_HOME/bash/bashrc
+# Loaded by /etc/profile already
+# [[ -f $XDG_CONFIG_HOME/bash/bashrc ]] && . $XDG_CONFIG_HOME/bash/bashrc
 {% if "graphical_vt" in features.get(profile, []) %}
 
 if [[ ! $DISPLAY && $XDG_VTNR -eq {{ lookup('env', "XDG_VTNR") | default(1, true) }} ]]; then
diff --git a/roles/tools/files/gio_unwrapper.sh b/roles/tools/files/gio_unwrapper.sh
index 5629b28..59886d6 100755
--- a/roles/tools/files/gio_unwrapper.sh
+++ b/roles/tools/files/gio_unwrapper.sh
@@ -13,7 +13,7 @@
 # environments)
 
 if [ -n "$GIO_LAUNCHED_DESKTOP_FILE" ]; then
-  while [ -n "$1" -a "${1:0:1}" != "/" -a ! -f "$1" ]; do
+  while [ -n "$1" -a "${1:0:1}" != "/" -a "${1:0:7}" != "file://" -a ! -f "$1" ]; do
     shift
   done
   xdg-open "$1"
diff --git a/roles/tools/files/vimrc b/roles/tools/files/vimrc
index 6de0f1c..eabcf38 100644
--- a/roles/tools/files/vimrc
+++ b/roles/tools/files/vimrc
@@ -35,6 +35,7 @@ Plug 'chrisbra/SudoEdit.vim'
 Plug 'Chiel92/vim-autoformat'
 Plug 'pearofducks/ansible-vim'
 Plug 'juliosueiras/vim-terraform-completion'
+Plug 'sjl/gundo.vim'
 
 call plug#end()
 
diff --git a/roles/tools/tasks/main.yml b/roles/tools/tasks/main.yml
index 82b575b..dea5a79 100644
--- a/roles/tools/tasks/main.yml
+++ b/roles/tools/tasks/main.yml
@@ -95,7 +95,7 @@
     value: "{{ item.1 }}"
   loop:
     - ["/org/gnome/evince/default/continuous", "true"]
-    - ["/org/gnome/evince/default/fullscreen", "true"]
+    - ["/org/gnome/evince/default/fullscreen", "false"]
     - ["/org/gtk/settings/file-chooser/sort-column", "'name'"]
     - ["/org/gtk/settings/file-chooser/show-size-column", "true"]
     - ["/org/gtk/settings/file-chooser/show-hidden", "true"]
-- 
2.41.0