3 files changed, 14 insertions, 10 deletions
diff --git a/tools/conf/etc/skel/.gitconfig b/tools/conf/etc/skel/.gitconfig
index f96ecf7..730d8d9 100644
--- a/tools/conf/etc/skel/.gitconfig
+++ b/tools/conf/etc/skel/.gitconfig
@@ -1,8 +1,10 @@
 [core]
 	pager = less -F -X
+	editor = vim
 [diff]
 	tool = vimdiff
 [merge]
 	tool = vimdiff
+	conflictstyle = diff3
 [difftool]
 	prompt = false
diff --git a/tools/conf/etc/skel/.vimrc b/tools/conf/etc/skel/.vimrc
index 2a45faf..0a3656d 100644
--- a/tools/conf/etc/skel/.vimrc
+++ b/tools/conf/etc/skel/.vimrc
@@ -110,7 +110,9 @@ map <F3> :tabprevious<CR>
 map <F4> :tabnext<CR>
 "
 "" Show Line Numbers
-set nu
+"" set nu
+"" Show Relative Line Numbers
+set relativenumber
 "set complete=.,b,u,]
 "set wildmode=longest,list:longest
 "set completeopt=menu,preview
@@ -145,7 +147,7 @@ autocmd BufWinLeave * call clearmatches()
 "" Finally, if you want an indent to correspond to a single tab, you should also use:
 ""set shiftwidth=4
 "" For indents that consist of 4 space characters but are entered with the tab key:
-set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab
+set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab
 "set list
 "" set past gives problems with tabs
 "" set paste
diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc
index 6ccd340..379a315 100644
--- a/tools/conf/etc/skel/.xinitrc
+++ b/tools/conf/etc/skel/.xinitrc
@@ -1,13 +1,13 @@
-## Start the window manager
-
-xrandr -s 1366x768
-#xrandr --dpi 100
-#xrandr --output eDP1 --mode 1366x768
+#xrandr --output eDP1 --mode 1024x768
+#xrandr -s 1366x768
+#xrandr --dpi 73
+#xrandr --dpi 96
 #xgamma -gamma 0.8
-#syndaemon -d
 setxkbmap dvorak
+#syndaemon -d
+#
+## Start the window manager
 
 #exec openbox-session
-#exec dwm
-exec spectrwm
 #exec start-mate
+exec spectrwm