2 files changed, 15 insertions, 5 deletions

diff --git a/src/cwd.rs b/src/cwd.rs
index c8af68e..3cc4a22 100644
--- a/src/cwd.rs
+++ b/src/cwd.rs
@@ -1,11 +1,22 @@
+use colored::*;
 use std::env;
 use tico::tico;
-use colored::*;
 
 pub fn cwd() -> Option<colored::ColoredString> {
     let path_env = env::current_dir().ok()?;
     let mut path = format!("{}", path_env.display());
     let home = env::var("HOME").unwrap();
+
+    let hide_home = env::var("HIDE_HOME_CWD").unwrap_or("0".into());
+    match hide_home.as_ref() {
+        "0" => {}
+        _ => {
+            if &path == &home {
+                return Some(colored::ColoredString::from(""));
+            }
+        }
+    }
+
     let tilde_expand = env::var("EXPAND_TILDE").unwrap_or("0".into());
 
     match tilde_expand.as_ref() {
@@ -23,7 +34,6 @@ pub fn cwd() -> Option<colored::ColoredString> {
     let cwd_color = env::var("CWD_COLOR").unwrap_or("white".into());
     match cwd_shorten.as_ref() {
         "0" => return Some(path.color(cwd_color)),
-        _ => return Some(tico(&path).color(cwd_color))
+        _ => return Some(tico(&path).color(cwd_color)),
     }
-
 }
diff --git a/src/main.rs b/src/main.rs
index 6ccca7b..aa19abd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -40,7 +40,7 @@ fn pista(zsh: bool) -> String {
     };
     let (branch, status) = match env::var("DISABLE_VCS").unwrap_or("0".into()).as_ref() {
         "0" => vcs::vcs_status().unwrap_or(("".into(), "".into())),
-        _ => ("".into(), "".into())
+        _ => ("".into(), "".into()),
     };
     let venv = venv::get_name();
     let prompt_char = prompt_char::get_char();
@@ -75,7 +75,7 @@ fn pista_minimal(zsh: bool) -> String {
     let mut vcs_component = String::new();
     if let Some((branch, status)) = vcs_tuple {
         vcs_component = format!(" [{} {}] ", branch, status);
-    } else {
+    } else if cwd.len() > 0 {
         vcs_component.push(' ');
     }
     let venv = venv::get_name();