From 06da784e108278878a797b0126d6d474eb4650d9 Mon Sep 17 00:00:00 2001
From: Severin Kaderli <severin.kaderli@gmail.com>
Date: Sun, 30 Oct 2016 14:41:39 +0100
Subject: [PATCH] Set default editor in .bashrc and updated install.sh

Signed-off-by: Severin Kaderli <severin.kaderli@gmail.com>
---
 .bashrc    | 8 ++++----
 .xinitrc   | 6 +++---
 install.sh | 4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.bashrc b/.bashrc
index f886ad7..e78747b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -107,6 +107,10 @@ export GTK_IM_MODULE=ibus
 export QT_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
 
+# Setting default editor
+export VISUAL=vim
+export EDITOR="$VISUAL"
+
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
 # sources /etc/bash.bashrc).
@@ -118,10 +122,6 @@ if ! shopt -oq posix; then
   fi
 fi
 
-if [ -x /usr/bin/mint-fortune ]; then
-     /usr/bin/mint-fortune
-fi
-
 # Add users bin directory to the PATH
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
diff --git a/.xinitrc b/.xinitrc
index 5e2f06d..4bb7bfd 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,11 +3,11 @@ xset s off
 xset -dpms
 xset s noblank
 
-# Load dconf
-cat "$HOME/dotfiles/dconf/config" | dconf load /
-
 # Start ibus
 ibus-daemon -d --xim
 
+# Load dconf
+dconf load / < "$HOME/dotfiles/dconf/config"
+
 # Start i3
 exec i3
diff --git a/install.sh b/install.sh
index 5233672..9ba4ee6 100644
--- a/install.sh
+++ b/install.sh
@@ -7,7 +7,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Setting up git configuration
 ln -s "$DIR/.gitconfig" "$HOME/.gitconfig"
 
+# Setting up vim configuration
+ln -s "$DIR/.vimrc" "$HOME/.vimrc"
+
 # Setting up various configuration files
+ln -s "$DIR/.bash_logout" "$HOME/.bash_logout"
 ln -s "$DIR/.bash_profile" "$HOME/.bash_profile"
 ln -s "$DIR/.bashrc" "$HOME/.bashrc"
 ln -s "$DIR/.aliases" "$HOME/.aliases"