From c1aae3af259b6ea254d66c334f3d398c19029518 Mon Sep 17 00:00:00 2001
From: Nicholas Tay <nkt@outlook.kr>
Date: Sat, 10 Apr 2021 14:56:23 +1000
Subject: macOS changes

---
 .bashrc               | 2 +-
 .config/aliasrc       | 8 ++++++--
 .config/nvim/init.vim | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.bashrc b/.bashrc
index 4f2ca54..0b64a93 100644
--- a/.bashrc
+++ b/.bashrc
@@ -12,7 +12,7 @@ PS1="\[\033[38;5;14m\]\u\[$(tput sgr0)\]\[\033[38;5;243m\]@\[$(tput sgr0)\]\[\03
 export HISTFILE="$HOME/.local/share/bash_history"
 
 # cd by name only is ok
-shopt -s autocd
+shopt -s autocd 2>/dev/null
 
 # Load our aliases
 [ -f $HOME/.config/aliasrc ] && . $HOME/.config/aliasrc
diff --git a/.config/aliasrc b/.config/aliasrc
index 1da43c6..364df5a 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -8,9 +8,13 @@ alias cp="cp -iv"
 alias mv="mv -iv"
 
 # Utility colours
-alias ls="ls --color=auto --group-directories-first"
 alias grep="grep --color=auto"
-alias diff="diff --color=auto"
+if [ "$(uname -s)" != "Darwin" ]; then
+	alias ls="ls --color=auto --group-directories-first"
+	alias diff="diff --color=auto"
+else
+	alias ls="ls -G"
+fi
 
 # dotfiles management
 alias d="git --git-dir=$HOME/.dotlite.git --work-tree=$HOME"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index cbeece5..8ede6bf 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -13,7 +13,7 @@ set nohlsearch
 set splitbelow splitright
 set scrolloff=6
 
-colorscheme industry
+colorscheme peachpuff
 
 set tabstop=4
 set softtabstop=0 noexpandtab
-- 
cgit