From aca4951ea37b5225364a68545624ad7ca11bb6da Mon Sep 17 00:00:00 2001
From: Jorrit Visser <jorritjanvisser@gmail.com>
Date: Sat, 20 May 2017 17:21:44 +0200
Subject: [PATCH] Rename to make life easier in install script

This rename allows the install script to do a simple copy instead of having to rename the files first. This improves install script reliability (KISS).
---
 templates/{zimrc => .zimrc}   |  2 +-
 templates/{zlogin => .zlogin} | 51 +++++++++++++++++------------------
 templates/.zshrc              |  8 ++++++
 templates/zshrc               | 11 --------
 4 files changed, 34 insertions(+), 38 deletions(-)
 rename templates/{zimrc => .zimrc} (99%)
 rename templates/{zlogin => .zlogin} (54%)
 create mode 100644 templates/.zshrc
 delete mode 100644 templates/zshrc

diff --git a/templates/zimrc b/templates/.zimrc
similarity index 99%
rename from templates/zimrc
rename to templates/.zimrc
index 9aad0e6..e1d4a7b 100644
--- a/templates/zimrc
+++ b/templates/.zimrc
@@ -1,4 +1,4 @@
-
+# .zimrc
 
 #################
 # CORE SETTINGS #
diff --git a/templates/zlogin b/templates/.zlogin
similarity index 54%
rename from templates/zlogin
rename to templates/.zlogin
index f05b263..be4235a 100644
--- a/templates/zlogin
+++ b/templates/.zlogin
@@ -1,5 +1,4 @@
-
-
+# .zlogin
 #
 # startup file read in interactive login shells
 #
@@ -7,53 +6,53 @@
 # This includes zcompile, zcompdump, etc.
 #
 
+# # # old settings go here
+
 (
   # Function to determine the need of a zcompile. If the .zwc file
   # does not exist, or the base file is newer, we need to compile.
   # These jobs are asynchronous, and will not impact the interactive shell
   zcompare() {
     if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then
-      zcompile ${1}
-    fi
+      zcompile ${1};
+    fi;
   }
 
-  zim_mods=${ZDOTDIR:-${HOME}}/.zim/modules
+  ZIM_MODS=${ZDOTDIR:-${HOME}}/.zim/modules
   setopt EXTENDED_GLOB
 
   # zcompile the completion cache; siginificant speedup.
   for file in ${ZDOTDIR:-${HOME}}/.zcomp^(*.zwc)(.); do
-    zcompare ${file}
-  done
+    zcompare ${file};
+  done;
 
   # zcompile .zshrc
   zcompare ${ZDOTDIR:-${HOME}}/.zshrc
 
   # zcompile some light module init scripts
-  zcompare ${zim_mods}/git/init.zsh
-  zcompare ${zim_mods}/utility/init.zsh
-  zcompare ${zim_mods}/pacman/init.zsh
-  zcompare ${zim_mods}/spectrum/init.zsh
-  zcompare ${zim_mods}/completion/init.zsh
-  zcompare ${zim_mods}/fasd/init.zsh
+  zcompare ${ZIM_MODS}/git/init.zsh
+  zcompare ${ZIM_MODS}/utility/init.zsh
+  zcompare ${ZIM_MODS}/pacman/init.zsh
+  zcompare ${ZIM_MODS}/spectrum/init.zsh
+  zcompare ${ZIM_MODS}/completion/init.zsh
+  zcompare ${ZIM_MODS}/fasd/init.zsh
 
   # zcompile all .zsh files in the custom module
-  for file in ${zim_mods}/custom/**/^(README.md|*.zwc)(.); do
-    zcompare ${file}
-  done
+  for file in ${ZIM_MODS}/custom/**/^(README.md|*.zwc)(.); do
+    zcompare ${file};
+  done;
 
   # zcompile all autoloaded functions
-  for file in ${zim_mods}/**/functions/^(*.zwc)(.); do
-    zcompare ${file}
-  done
+  for file in ${ZIM_MODS}/**/functions/^(*.zwc)(.); do
+    zcompare ${file};
+  done;
 
   # syntax-highlighting
-  for file in ${zim_mods}/syntax-highlighting/external/highlighters/**/*.zsh; do
-    zcompare ${file}
-  done
-  zcompare ${zim_mods}/syntax-highlighting/external/zsh-syntax-highlighting.zsh
+  for file in ${ZIM_MODS}/syntax-highlighting/external/highlighters/**/*.zsh; do
+    zcompare ${file};
+  done;
+  zcompare ${ZIM_MODS}/syntax-highlighting/external/zsh-syntax-highlighting.zsh
 
   # zsh-histery-substring-search
-  zcompare ${zim_mods}/history-substring-search/external/zsh-history-substring-search.zsh
-  
-
+  zcompare ${ZIM_MODS}/history-substring-search/external/zsh-history-substring-search.zsh
 ) &!
diff --git a/templates/.zshrc b/templates/.zshrc
new file mode 100644
index 0000000..efd64e4
--- /dev/null
+++ b/templates/.zshrc
@@ -0,0 +1,8 @@
+# .zshrc
+
+# # # old settings go here # # #
+
+# # # load Zim # # #
+if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then
+  source ${ZDOTDIR:-${HOME}}/.zim/init.zsh;
+fi;
diff --git a/templates/zshrc b/templates/zshrc
deleted file mode 100644
index e640dcc..0000000
--- a/templates/zshrc
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-#
-# User configuration sourced by interactive shells
-#
-
-# Source zim
-if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then
-  source ${ZDOTDIR:-${HOME}}/.zim/init.zsh
-fi
-