Merge branch 'master' into mac

2 files changed, 3 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 3879729..2ab3931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,7 +88,7 @@ guitarix/
 hammerspoon/Spoons/
 Hellbeast v2/
 Hellbeast v2.settings
-htop/htoprc
+htop/
 ibus/
 icedtea-web/
 inkscape/
@@ -143,6 +143,7 @@ mgba/
 micro/buffers/
 mimeapps.list
 minigalaxy/
+miopen/
 mixbus9/
 mksh/history
 modprobed.db
diff --git a/sh/aliases b/sh/aliases
index 0abc42c..ac0d8f6 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -20,6 +20,7 @@ case `uname -s` in
   "Linux")
     #alias ls="ls -h $COLOR_FLAGS_GNU"
     type eza >/dev/null && alias ls="eza"
+    alias ls="ls --color"
     ;;
   "Darwin")
     type eza >/dev/null && alias ls="eza --color"