Updated for macos

4 files changed, 44 insertions, 12 deletions

diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index 77ee41e..5255fa7 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -92,4 +92,7 @@ export YSU_MESSAGE_POSITION="after"                                 # you-should
 
 # install pkgfile package on Arch Linux
 # run `pkgfile --update`
-.  /usr/share/doc/pkgfile/command-not-found.zsh
+if [ "$(uname)" = 'Linux' ]
+then
+    .  /usr/share/doc/pkgfile/command-not-found.zsh
+fi
diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh
index b2ca0a9..7957167 100644
--- a/config/zsh/aliases.zsh
+++ b/config/zsh/aliases.zsh
@@ -21,7 +21,12 @@ alias doas='doas '     # same for doas
 alias info='info --vi-keys'
 
 # ls
-alias ls='ls --color=auto -Fh'
+if [ "$(uname)" = 'Linux' ]
+then
+    alias ls='ls --color=auto -Fh'
+else
+    alias ls='ls -G -Fh'
+fi
 alias ll="ls -l"
 alias la="ls -A"
 alias lla="ls -Al"
diff --git a/config/zsh/zprofile b/config/zsh/zprofile
index 5d5f01b..1388cd9 100755
--- a/config/zsh/zprofile
+++ b/config/zsh/zprofile
@@ -1,15 +1,25 @@
 #!/bin/zsh
 
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin"
+if [ "$(uname)" = 'Linux' ]
+then
+    export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin"
+    export TERM='st-256color'
+    export MAIL='me@cacharle.xyz'
+    export SUDO='doas'
+elif [ "$(uname)" = 'Darwin' ]
+then
+    export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin"
+    export TERM='xterm-256color'
+    export MAIL='charles.cabergs@colruytgroup.com'
+    export SUDO='sudo'
+fi
 
 # applications
 export EDITOR='vim'
-export TERM='st-256color'
 export TERMINAL='st'
-export MAIL='me@cacharle.xyz'
 export BROWSER='qutebrowser'
 export BROWSERCLI='w3m'
-export SUDO='doas'
 
 # XDG all the things
 export XDG_CONFIG_HOME="$HOME/.config"
@@ -68,7 +78,7 @@ export MINIKUBE_IN_STYLE=false  # disable cringe minikube emojies
 export CLOUT_SYNC_DIR="clout-sync/"
 export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR"
 
-if [ "$(tty)" = '/dev/tty1' ]
+if [ "$(uname)" = 'Linux' ] && [ "$(tty)" = '/dev/tty1' ]
 then
     startx "$XDG_CONFIG_HOME/x11/xinitrc"
     poweroff
diff --git a/install b/install
index 418c35c..4a2fb5a 100755
--- a/install
+++ b/install
@@ -27,9 +27,12 @@ mkdir -pv "$XDG_CONFIG_HOME"
 mkdir -pv "$XDG_DATA_HOME"
 mkdir -pv "$XDG_CACHE_HOME"
 # xmonad uses ~/.xmonad if those directories don't already exists
-mkdir -pv "$XMONAD_CONFIG_HOME"
-mkdir -pv "$XMONAD_DATA_HOME"
-mkdir -pv "$XMONAD_CACHE_HOME"
+if [ $(uname) = Linux ]
+then
+    mkdir -pv "$XMONAD_CONFIG_HOME"
+    mkdir -pv "$XMONAD_DATA_HOME"
+    mkdir -pv "$XMONAD_CACHE_HOME"
+fi
 
 echo '---------------------------- CONFIG FILE LINKS ---------------------------'
 
@@ -71,6 +74,11 @@ PLUGURL='https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
 [ ! -f "$PLUGFILE" ] && curl -fLo "$PLUGFILE" --create-dirs "$PLUGURL"
 vim -c "PlugInstall" -c "qa"
 
+PACKERDIR="$XDG_DATA_HOME/nvim/site/pack/packer/start/packer.nvim"
+PACKERURL='https://github.com/wbthomason/packer.nvim'
+[ ! -d "$PACKERDIR" ] && git clone --depth 1 "$PACKERURL" "$PACKERDIR"
+vim -c "PackerInstall" -c "qa"
+
 ###############################################################################
 # zsh pluggins
 ###############################################################################
@@ -92,6 +100,12 @@ parallel_start update_zsh_plugin 'https://github.com/zsh-users/zsh-syntax-highli
 parallel_start update_zsh_plugin 'https://github.com/MichaelAquilina/zsh-you-should-use'
 parallel_wait
 
+[ $(uname) = Darwin ] && exit
+
+###############################################################################
+# Linux specific
+###############################################################################
+
 ###############################################################################
 # crontab
 ###############################################################################
@@ -101,14 +115,14 @@ echo '---------------------------- INSTALL CRONTAB -----------------------------
 if [ "$(cat /etc/hostname)" = 'charleslaptopcarbon' ]
 then
     cat crontab/user.crontab crontab/laptop.crontab | crontab -
-else
+elif [ "$(cat /etc/hostname)" = 'cacharle-main' ]
     crontab crontab/user.crontab
 fi
 
 echo 'INFO: Run this script as root if you want to install the root contab'
 
 ###############################################################################
-# dictionaties
+# dictionaries
 ###############################################################################
 
 echo '---------------------------- INSTALL DICTIONARY --------------------------'