jan/.dotfiles
1
0
Fork 0
mirror of https://github.com/JanJastrow/.dotfiles.git synced 2024-11-23 19:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: jan:3a2aee76817cedeb0291d9b75082c4d8bb6ac943
Branches Tags
jan:main
..
compare: jan:b438c90574bdbf0bb28fb69ce15062387feb90aa
Branches Tags
jan:main

6 Commits
3a2aee7681 ... b438c90574

Author SHA1 Message Date
Jan Jastrow
b438c90574 Fix typo and indentation 2022-02-20 17:58:58 +01:00
Jan Jastrow
22eafc0f0b Fix indentation 2022-02-20 17:58:05 +01:00
Jan Jastrow
d83b47d314 general cleanup 2022-02-20 17:40:01 +01:00
Jan Jastrow
b8b7c9377f Added dynamic homebrew path 2022-02-20 17:39:39 +01:00
Jan Jastrow
6505fc5a75 Added comment 2022-02-20 17:38:48 +01:00
Jan Jastrow
73c570d598 Move language env to top 2022-02-20 17:38:32 +01:00
3 changed files with 31 additions and 24 deletions
Show Stats Expand all files Collapse all files

39
zsh/env
View File

@ -2,30 +2,30 @@
# filename: /zsh/env # filename: /zsh/env
#-------------------------------- #--------------------------------
# set default editor
export EDITOR="nano"
# set `ll` command - b(etter)ls per default
alias ll=bls
if [[ -x `which /usr/local/bin/exa` || -x `which /opt/homebrew/bin/exa` ]]; then
alias ll=exa
fi
if [[ -x `which /usr/local/bin/lsd` || -x `which /opt/homebrew/bin/lsd` ]]; then
alias ll=lsd
fi
# set language # set language
export LANGUAGE=en_US.UTF-8 export LANGUAGE=en_US.UTF-8
export LC_ALL=en_US.UTF-8 export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
export LC_TYPE=en_US.UTF-8 export LC_TYPE=en_US.UTF-8
# set default editor
export EDITOR="nano"
# set `ll` command - b(etter)ls per default
alias ll=bls
if test -f "$homebrew_path/exa"; then
alias ll=exa
fi
if test -f "$homebrew_path/lsd"; then
alias ll=lsd
fi
# #
# Path additions # Path additions
# #
if test -d "/opt/homebrew/"; then if test -d "/opt/homebrew/"; then
export PATH="/opt/homebrew/bin/:$PATH" export PATH="/opt/homebrew/bin:$PATH"
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
fi fi
@ -60,17 +60,12 @@ if [[ $platform == 'macOS' ]]; then
fi fi
fi fi
if test -d "/opt/homebrew/opt/openjdk/bin"; then if test -d "$homebrew_opt/openjdk/bin/"; then
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH" export PATH="$homebrew_opt/openjdk/bin:$PATH"
fi
if test -d "/usr/local/opt/java/bin/"; then
export PATH="/usr/local/opt/java/bin/:$PATH"
fi fi
/usr/local/opt/java/bin/ if test -d "$homebrew_opt/ruby"; then
export PATH="$homebrew_opt/ruby/bin:$PATH"
if test -d "/usr/local/opt/ruby"; then
export PATH="/usr/local/opt/ruby/bin:$PATH"
fi fi
if test -d "/usr/local/sbin"; then if test -d "/usr/local/sbin"; then

12
zshrc
View File

@ -19,6 +19,8 @@ if [[ $(uname) == 'Linux' ]]; then
elif [[ $(uname) == 'Darwin' ]]; then elif [[ $(uname) == 'Darwin' ]]; then
platform='macOS' platform='macOS'
fi fi
# Define CPU architecture
arch='Unknown' arch='Unknown'
if [[ $(uname -p) == 'arm' ]]; then if [[ $(uname -p) == 'arm' ]]; then
arch="arm" arch="arm"
@ -28,6 +30,16 @@ elif [[ $(uname -p) == 'x86_64' ]]; then
arch="x86_64" arch="x86_64"
fi fi
# Homebrew
homebrew_path=""
if test -f "/opt/homebrew/bin/brew"; then
homebrew_path="/opt/homebrew/bin"
homebrew_opt="/opt/homebrew/opt"
elif test -f "/usr/local/bin/brew"; then
homebrew_path="/usr/local/bin"
homebrew_opt="/usr/local/opt"
fi
# Load additional settings # Load additional settings
source $HOME/.dotfiles/zsh/env source $HOME/.dotfiles/zsh/env
source $HOME/.dotfiles/zsh/alias source $HOME/.dotfiles/zsh/alias