From 74fc927297e8298c4aafa75ac5d4038ae2cf023a Mon Sep 17 00:00:00 2001
From: pztrn <pztrn@pztrn.name>
Date: Sun, 8 Mar 2015 22:21:29 +0500
Subject: [PATCH] Configuration files now works.

---
 .gitignore                          |  2 ++
 zsh/01-config.zsh                   | 10 ++++++++++
 zsh/50-aliases.zsh                  |  3 +++
 zsh/defaults/01-main.conf           |  7 +++++++
 zsh/defaults/50-pyenv.conf          |  4 ++++
 zsh/defaults/90-fbterm.conf         |  4 ++++
 zsh/defaults/exports/01-path.conf   |  2 ++
 zsh/defaults/exports/05-editor.conf |  1 +
 zsh/exports/01-path.zsh             |  5 +----
 zshrc                               | 20 --------------------
 10 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 zsh/01-config.zsh
 create mode 100644 zsh/defaults/01-main.conf
 create mode 100644 zsh/defaults/50-pyenv.conf
 create mode 100644 zsh/defaults/90-fbterm.conf
 create mode 100644 zsh/defaults/exports/01-path.conf
 create mode 100644 zsh/defaults/exports/05-editor.conf

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7a4d086
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*kdev4
+*kate-swp
diff --git a/zsh/01-config.zsh b/zsh/01-config.zsh
new file mode 100644
index 0000000..79180c4
--- /dev/null
+++ b/zsh/01-config.zsh
@@ -0,0 +1,10 @@
+# Configuration file loader.
+
+if [ ! -d ${HOME}/.zsh-config.d/ ]; then
+    cp -R ${CONFIG_PATH}/zsh/defaults/ ${HOME}/.zsh-config.d
+    echo "Looks like it's a very first launch. So I've copied default config to '${HOME}/.zsh-config.d/'"
+fi
+
+for file in `ls ${HOME}/.zsh-config.d/ | sort`; do
+    source ${HOME}/.zsh-config.d/${file}
+done
\ No newline at end of file
diff --git a/zsh/50-aliases.zsh b/zsh/50-aliases.zsh
index 734ec9b..87a9e71 100644
--- a/zsh/50-aliases.zsh
+++ b/zsh/50-aliases.zsh
@@ -1,3 +1,6 @@
+# Some great default aliases.
+# Custom aliases should go to ${HOME}/.zsh-config.d/10-aliases.conf
+# (or other file).
 alias screen="TERM=xterm screen"
 
 # Other
diff --git a/zsh/defaults/01-main.conf b/zsh/defaults/01-main.conf
new file mode 100644
index 0000000..1f4cf5c
--- /dev/null
+++ b/zsh/defaults/01-main.conf
@@ -0,0 +1,7 @@
+# Main configuration file. Controls over some vital things.
+
+# The very important thing - debug.
+# Should we enable debug output?
+DEBUG=0
+# Prompt configuration
+PROMPT_THEME="pztrn"
\ No newline at end of file
diff --git a/zsh/defaults/50-pyenv.conf b/zsh/defaults/50-pyenv.conf
new file mode 100644
index 0000000..4df7258
--- /dev/null
+++ b/zsh/defaults/50-pyenv.conf
@@ -0,0 +1,4 @@
+# PyENV in use?
+USE_PYENV=0
+# Path to PyENV.
+PYENV_PATH="/data/.pyenv"
\ No newline at end of file
diff --git a/zsh/defaults/90-fbterm.conf b/zsh/defaults/90-fbterm.conf
new file mode 100644
index 0000000..e18f23d
--- /dev/null
+++ b/zsh/defaults/90-fbterm.conf
@@ -0,0 +1,4 @@
+# FBTerm - should we use it?
+# nVidia users with proprietary drivers - sorry, you can't use it.
+# Other OS users - sorry also.
+USE_FBTERM=0
\ No newline at end of file
diff --git a/zsh/defaults/exports/01-path.conf b/zsh/defaults/exports/01-path.conf
new file mode 100644
index 0000000..8d58c22
--- /dev/null
+++ b/zsh/defaults/exports/01-path.conf
@@ -0,0 +1,2 @@
+# Add here your own paths.
+export PATH="$PATH"
\ No newline at end of file
diff --git a/zsh/defaults/exports/05-editor.conf b/zsh/defaults/exports/05-editor.conf
new file mode 100644
index 0000000..c6889b0
--- /dev/null
+++ b/zsh/defaults/exports/05-editor.conf
@@ -0,0 +1 @@
+EDITOR="nano"
\ No newline at end of file
diff --git a/zsh/exports/01-path.zsh b/zsh/exports/01-path.zsh
index 03dc3a5..86c1535 100644
--- a/zsh/exports/01-path.zsh
+++ b/zsh/exports/01-path.zsh
@@ -1,5 +1,2 @@
 # This is default PATHs.
-export PATH="/usr/lib:/usr/lib/colorgcc/bin:/usr/sbin:/sbin:$PATH"
-
-# Add here your own.
-export PATH="$PATH:/usr/local/heroku/bin:/data/Programs/hyde:/home/pztrn/bin"
\ No newline at end of file
+export PATH="/bin:/usr/lib:/usr/lib/colorgcc/bin:/usr/sbin:/sbin:$PATH"
\ No newline at end of file
diff --git a/zshrc b/zshrc
index 192b44e..429669d 100644
--- a/zshrc
+++ b/zshrc
@@ -3,26 +3,6 @@
 
 #. /etc/profile
 
-#####################################################################
-# CONFIGURATION
-# -------------
-# You should set these variables :)
-#####################################################################
-# The very important thing - debug.
-# Should we enable debug output?
-DEBUG=0
-# Prompt configuration
-PROMPT_THEME="pztrn"
-
-# FBTerm - should we use it?
-# nVidia users with proprietary drivers - sorry, you can't use it.
-USE_FBTERM=0
-
-# PyENV in use?
-USE_PYENV=0
-# Path to PyENV.
-PYENV_PATH="/data/.pyenv"
-
 #####################################################################
 # INITIALIZATION
 # --------------