Merge pull request 'wood' (#3) from wood into master

Reviewed-on: http://wood.hell:8030/lachtan/linux-workspace/pulls/3

.editorconfig

@@ -10,6 +10,9 @@ end_of_line=lf
 indent_size = 4
 indent_style = space
 
+[*.sh]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
 indent_size = 2

README.md

@@ -3,6 +3,7 @@
 Repository of config files, scripts and other staff to enable quick and easy configuring a new computer.
 
 ## Quick start
+
 Add to $HOME/.bashrc file:
 `source <full_path_to_repository>/bashrc`
 
@@ -15,13 +16,11 @@ For debug log enabled
 `LWS_DEBUG=1`
 
 ## Quick commands
-```
+
+```bash
 # reload full configuration
 reload-workspace
-# home directory of project
-$LWS
-```
 
-### TODO
-- vim configuration
-- debian packages installation
+# home directory of project
+echo $LWS
+```

functions.sh

@@ -1,9 +1,17 @@
 # Linux Workspace Functions
 
 if [ -z "$time_ms" ]; then
-  readonly time_ms='date +%s%3N'
+    readonly time_ms='date +%s%3N'
 fi
 
+function is_fast_init() {
+    (( $LWS_FAST ))
+}
+
+function is_slow_init() {
+    ! is_fast_init
+}
+
 function xlog() {
   if true_false "$LWS_DEBUG"; then
     echo "$@"
@@ -70,7 +78,7 @@ function remove_path() {
 }
 
 function uniq_path() {
-  echo "$PATH" | tr ":" "\n" | awk '!seen[$0]++' | tr "\n" ":" | sed -r 's/:+/:/g' | sed -r 's/^:|:$//g'
+  path | awk '!seen[$0]++' | tr "\n" ":" | sed -r 's/:+/:/g' | sed -r 's/^:|:$//g'
 }
 
 function set_uniq_path() {

rc.local/pyenv.sh

@@ -1,8 +1,12 @@
-# Initializae pyenv
+# Initialize pyenv
 
-if (( ! $LWS_FAST )); then
-  if can_run pyenv; then
-    export PYENV_ROOT=${PYENV_ROOT:-$HOME/.pyenv}
+if is_slow_init; then
+  PYENV_ROOT="${PYENV_ROOT:-$HOME/.pyenv}"
+  if [[ -d "$PYENV_ROOT" ]]; then
+    export PYENV_ROOT
+    if ! can_run pyenv; then
+      append_path "$PYENV_ROOT/bin"
+    fi
     eval "$(pyenv init -)"
   fi
 fi

rc/direnv.sh

@@ -1,5 +1,5 @@
 # Loading direnv bash hook
 
-if command -v direnv > /dev/null; then
+if can_run direnv; then
   eval "$(direnv hook bash)"
 fi

rc/thefuck.sh

@@ -1,5 +1,3 @@
-if [[ -z "$LWS_FAST" ]]; then
-  if can_run thefuck; then
-    eval "$(thefuck --alias)"
-  fi
+if is_slow_init && can_run thefuck; then
+  eval "$(thefuck --alias)"
 fi