aboutsummaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.config/aliasrc8
-rw-r--r--.config/nvim/init.vim2
2 files changed, 7 insertions, 3 deletions
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