From: Ruben Beltran del Rio Date: Mon, 28 Jun 2021 11:29:12 +0000 (+0200) Subject: Add linux compatibility fixes X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/cd3948f4d8c338ed47ffd28f7cb92d5e6ced80e8?ds=sidebyside;hp=8cbd4ff09c6ad07aff34ceddcf37f6b74148a943 Add linux compatibility fixes --- diff --git a/install_dotfiles b/install_dotfiles index 60f9a71..d534baf 100755 --- a/install_dotfiles +++ b/install_dotfiles @@ -3,54 +3,54 @@ echo "Linking runcoms" # hush login -ln -fhs .dotfiles/hushlogin ~/.hushlogin +ln -fns .dotfiles/hushlogin ~/.hushlogin # zsh runcoms -ln -fhs .dotfiles/runcoms/zshrc ~/.zshrc -ln -fhs .dotfiles/runcoms/zshenv ~/.zshenv -ln -fhs .dotfiles/runcoms/zprofile ~/.zprofile -ln -fhs .dotfiles/runcoms/zlogout ~/.zlogout -ln -fhs .dotfiles/runcoms/zlogin ~/.zlogin +ln -fns .dotfiles/runcoms/zshrc ~/.zshrc +ln -fns .dotfiles/runcoms/zshenv ~/.zshenv +ln -fns .dotfiles/runcoms/zprofile ~/.zprofile +ln -fns .dotfiles/runcoms/zlogout ~/.zlogout +ln -fns .dotfiles/runcoms/zlogin ~/.zlogin # Weechat -ln -fhs .dotfiles/weechat ~/.weechat +ln -fns .dotfiles/weechat ~/.weechat # VIM -ln -fhs .dotfiles/vim ~/.vim -ln -fhs .dotfiles/vimrc ~/.vimrc +ln -fns .dotfiles/vim ~/.vim +ln -fns .dotfiles/vimrc ~/.vimrc # TMUX -ln -fhs .dotfiles/tmux.conf ~/.tmux.conf +ln -fns .dotfiles/tmux.conf ~/.tmux.conf # Nethack -ln -fhs .dotfiles/nethackrc ~/.nethackrc +ln -fns .dotfiles/nethackrc ~/.nethackrc # Git -ln -fhs .dotfiles/gitconfig ~/.gitconfig +ln -fns .dotfiles/gitconfig ~/.gitconfig # Ctags -ln -fhs .dotfiles/ctags.d ~/.ctags.d +ln -fns .dotfiles/ctags.d ~/.ctags.d # XDefaults -ln -fhs .dotfiles/XDefaults ~/.XDefaults +ln -fns .dotfiles/XDefaults ~/.XDefaults # ripgrep -ln -fhs .dotfiles/rgignore ~/.rgignore +ln -fns .dotfiles/rgignore ~/.rgignore # tmuxp -ln -fhs .dotfiles/tmuxp ~/.tmuxp +ln -fns .dotfiles/tmuxp ~/.tmuxp # config dir mkdir -p ~/.config # kitty -ln -fhs ../.dotfiles/config/kitty ~/.config/kitty +ln -fns ../.dotfiles/config/kitty ~/.config/kitty # nvim -ln -fhs ../.dotfiles/config/nvim ~/.config/nvim +ln -fns ../.dotfiles/config/nvim ~/.config/nvim # config -ln -fhs ../.dotfiles/config/karabiner ~/.config/karabiner +ln -fns ../.dotfiles/config/karabiner ~/.config/karabiner # Italics setup echo "Setting up terminfo" diff --git a/runcoms/zshrc b/runcoms/zshrc index 9f53b8b..780b526 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -51,7 +51,7 @@ export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" export GPG_TTY=$(tty) # FZF Config -export FZF_DEFAULT_COMMAND='/usr/local/bin/rg --color never --files --hidden -g \!.git' +export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git' export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500''' # Z @@ -71,7 +71,13 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then source "${ZDOTDIR:-$HOME}/.zshrc.local" fi -eval $(/usr/libexec/path_helper -s) +if command -v brew &> /dev/null; then + eval $(/usr/libexec/path_helper -s) +fi # ASDF -. $(brew --prefix asdf)/asdf.sh +if ! command -v brew &> /dev/null; then + . $HOME/.asdf/asdf.sh +else + . $(brew --prefix asdf)/asdf.sh +fi