From 10718067ca38cc353163e1ba564ef716834480d2 Mon Sep 17 00:00:00 2001
From: katherine <shmibs@shmibbles.me>
Date: Tue, 26 Jan 2016 00:08:56 -0700
Subject: actually run ~/.config/init/init.sh

---
 .config/init/gen-zathurarc.sh | 2 +-
 .config/init/init.sh          | 2 +-
 .vimrc                        | 1 +
 .xinitrc                      | 3 +++
 .zshrc-linux                  | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.config/init/gen-zathurarc.sh b/.config/init/gen-zathurarc.sh
index b8f9169..576cebb 100644
--- a/.config/init/gen-zathurarc.sh
+++ b/.config/init/gen-zathurarc.sh
@@ -1,6 +1,6 @@
 {
 
-echo "
+echo "\
 set font                    \"$ttfont\"
 
 set highlight-color         \"$bg_normal\"
diff --git a/.config/init/init.sh b/.config/init/init.sh
index 0d7ff58..c4a0ba2 100755
--- a/.config/init/init.sh
+++ b/.config/init/init.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 source ~/.config/init/vars
 
-source gen-zathurarc.sh
+source ~/.config/init/gen-zathurarc.sh
diff --git a/.vimrc b/.vimrc
index 0955b90..f2bd25a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -171,6 +171,7 @@ autocmd BufNewFile,BufRead *.tex set filetype=tex
 autocmd FileType asm     call Settings_asm()
 autocmd FileType c       call Settings_c()
 autocmd FileType coffee  call Settings_coffee()
+autocmd FileType conf    call Settings_script()
 autocmd FileType cpp     call Settings_c()
 autocmd FileType css     call Settings_c()
 autocmd FileType d       call Settings_c()
diff --git a/.xinitrc b/.xinitrc
index 774578a..b712736 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,3 +1,6 @@
+#initialise configs to auto-match themes
+~/.config/init/init.sh
+
 #merge Xresources
 if [ -s ~/.Xresources ]
 then
diff --git a/.zshrc-linux b/.zshrc-linux
index a510ac6..46d325f 100644
--- a/.zshrc-linux
+++ b/.zshrc-linux
@@ -5,7 +5,7 @@ alias grep='grep --color=auto'
 alias latex='latex -output-format=pdf'
 alias less='less -R'
 alias ls='ls --color=auto'
-alias ll='ls -l --color=auto'
+alias ll='ls -lh --color=auto'
 
 alias def='sdcv'
 alias dvd='mpv --deinterlace=yes dvd://'
-- 
cgit v1.2.3