Update the colors to use Fixed

3 files changed, 22 insertions, 29 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 15040fa..0eff88b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -98,7 +98,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lsd"
-version = "0.2.0"
+version = "0.2.1-pre"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/color.rs b/src/color.rs
index a96361e..b66dd07 100644
--- a/src/color.rs
+++ b/src/color.rs
@@ -6,8 +6,6 @@ use std::collections::HashMap;
 pub enum Elem {
     /// Node type
     File,
-    UnrecognizedFile,
-    RecognizedFile,
     SymLink,
     Dir,
 
@@ -22,10 +20,6 @@ pub enum Elem {
     HourOld,
     Older,
 
-    /// Link
-    DeadLink,
-    Link,
-
     /// User / Group Name
     User,
     Group,
@@ -36,37 +30,36 @@ pub enum Elem {
     FileSmall,
 }
 
+// You can find the table for each color, code, and display at:
+//
+//https://jonasjacek.github.io/colors/
 lazy_static! {
     pub static ref Colors: HashMap<Elem, Colour> = {
         let mut m = HashMap::new();
         // User / Group
-        m.insert(Elem::User, Colour::RGB(0xFF, 0xFF, 0xD8));
-        m.insert(Elem::Group, Colour::RGB(0xD9, 0xD9, 0x8F));
+        m.insert(Elem::User, Colour::Fixed(230)); // Cornsilk1
+        m.insert(Elem::Group, Colour::Fixed(187)); // LightYellow3
 
         // Permissions
-        m.insert(Elem::Read, Colour::RGB(0x5f, 0xD7, 0x5F));
-        m.insert(Elem::Write, Colour::RGB(0xD7, 0xD7, 0x87));
-        m.insert(Elem::Exec, Colour::RGB(0xCD, 0x3A, 0x3A));
-        m.insert(Elem::NoAccess, Colour::RGB(0xD7, 0x89, 0x89));
+        m.insert(Elem::Read, Colour::Fixed(40)); // Green3
+        m.insert(Elem::Write, Colour::Fixed(192)); // DarkOliveGreen1
+        m.insert(Elem::Exec, Colour::Fixed(124)); // Red3
+        m.insert(Elem::NoAccess, Colour::Fixed(168)); // HotPink3
 
         // Path Kind
-        m.insert(Elem::UnrecognizedFile, Colour::RGB(0xFF, 0xFF, 0x04));
-        m.insert(Elem::RecognizedFile, Colour::RGB(0x04, 0xFF, 0x04));
-        m.insert(Elem::Dir, Colour::RGB(0x00, 0xAF, 0xFF));
-        m.insert(Elem::SymLink, Colour::RGB(0xFF, 0x00, 0x00));
+        m.insert(Elem::File , Colour::Fixed(184)); // Yellow3
+        m.insert(Elem::Dir, Colour::Fixed(33)); // DodgerBlue1
+        m.insert(Elem::SymLink, Colour::Fixed(44)); // DarkTurquoise
 
         // Last Time Modified
-        m.insert(Elem::HourOld, Colour::RGB(0x2C, 0xFF, 0x2C));
-        m.insert(Elem::DayOld, Colour::RGB(0x1C, 0xFF, 0xB7));
-        m.insert(Elem::Older, Colour::RGB(0x63, 0xB1, 0x8A));
+        m.insert(Elem::HourOld, Colour::Fixed(40)); // Green3
+        m.insert(Elem::DayOld, Colour::Fixed(42)); // SpringGreen2
+        m.insert(Elem::Older, Colour::Fixed(36)); // DarkCyan
 
         // Last Time Modified
-        m.insert(Elem::FileSmall, Colour::RGB(0xFF, 0xFF, 0xD9));
-        m.insert(Elem::FileMedium, Colour::RGB(0x1C, 0xFF, 0xB7));
-        m.insert(Elem::FileLarge, Colour::RGB(0xFF, 0xB0, 0x00));
-
-        // Link
-        m.insert(Elem::Link, Colour::RGB(0x3B, 0xCE, 0xCE));
+        m.insert(Elem::FileSmall, Colour::Fixed(229)); // Wheat1
+        m.insert(Elem::FileMedium, Colour::Fixed(216)); // LightSalmon1
+        m.insert(Elem::FileLarge, Colour::Fixed(172)); // Orange3
 
         m
     };
@@ -83,7 +76,7 @@ lazy_static! {
         m.insert(Elem::NoAccess, Colors[&Elem::NoAccess].paint(String::from("-")).to_string());
 
         // Note types
-        m.insert(Elem::File , Colors[&Elem::UnrecognizedFile].paint(String::from(".")).to_string());
+        m.insert(Elem::File , Colors[&Elem::File].paint(String::from(".")).to_string());
         m.insert(Elem::Dir, Colors[&Elem::Dir].paint(String::from("d")).to_string());
         m.insert(Elem::SymLink, Colors[&Elem::SymLink].paint(String::from("l")).to_string());
 
diff --git a/src/formatter.rs b/src/formatter.rs
index e3b4c4f..adfc7d7 100644
--- a/src/formatter.rs
+++ b/src/formatter.rs
@@ -21,7 +21,7 @@ impl Formatter {
         let color = if meta.metadata.is_dir() {
             Colors[&Elem::Dir]
         } else {
-            Colors[&Elem::UnrecognizedFile]
+            Colors[&Elem::File]
         };
 
         let mut name = meta.name.clone();
@@ -39,7 +39,7 @@ impl Formatter {
         let mut content = String::new();
 
         if let Type::SymLink(ref target) = meta.node_type {
-            let color = Colors[&Elem::Link];
+            let color = Colors[&Elem::SymLink];
             content += &color.paint(String::from(" ⇒ ") + &color.paint(target).to_string());
         }