diff --git a/.aliases b/.aliases index 30085b7..3385828 100755 --- a/.aliases +++ b/.aliases @@ -32,7 +32,7 @@ alias la="ls -laF ${colorflag}" alias lsd="ls -lF ${colorflag} | grep --color=never '^d'" # List all files using Exa -alias e="exa -ghla" +alias e="eza -ghla" # Always use color output for `ls` alias ls="command ls ${colorflag}" diff --git a/.bash_profile b/.bash_profile index cd0a047..0d41947 100755 --- a/.bash_profile +++ b/.bash_profile @@ -1,5 +1,5 @@ # Add `~/bin` to the `$PATH` -export PATH="$HOME/bin:$PATH"; +export PATH="$HOME/bin:$HOME/.deno/bin:$PATH"; #export PATH="$HOME/bin:$PATH:/Applications/Visual Studio Code.app/Contents/Resources/app/bin"; # Load the shell dotfiles, and then some: @@ -101,3 +101,4 @@ fi; complete -W "NSGlobalDomain" defaults; [[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh" +. "$HOME/.cargo/env" diff --git a/.bashrc b/.bashrc index 31102ad..858549d 100755 --- a/.bashrc +++ b/.bashrc @@ -3,3 +3,4 @@ if [ -r $(brew --prefix)/opt/mcfly/mcfly.bash ]; then . $(brew --prefix)/opt/mcfly/mcfly.bash fi +. "$HOME/.cargo/env" diff --git a/.gitignore b/.gitignore index 0a2b91b..d3832c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # git credential file .gitconfig.local .extra +.secret-cask.sh # Folder view configuration files .DS_Store diff --git a/.zshrc b/.zshrc index 5413736..0d7af74 100755 --- a/.zshrc +++ b/.zshrc @@ -5,7 +5,6 @@ SAVEHIST=100000 # vim bindings bindkey -v - fpath=( "$HOME/.zfunctions" $fpath ) # Guess what to install when running an unknown command. @@ -181,4 +180,4 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" - +eval "$(atuin init zsh)" diff --git a/brew-cask.sh b/brew-cask.sh index 0504bd5..dcf2790 100755 --- a/brew-cask.sh +++ b/brew-cask.sh @@ -5,10 +5,6 @@ brew install homebrew/cask-cask -# work related -# brew install --cask slack -# brew install --cask virtualbox - # browsers brew install --cask google-chrome brew install --cask google-chrome-canary @@ -19,19 +15,20 @@ brew install --cask firefox brew install --cask rectangle brew install --cask spotify brew install --cask caffeine -brew install --cask simplenote brew install --cask whatsapp brew install --cask telegram +brew install --cask discord brew install --cask mailspring -brew install --cask setapp +brew install --cask tableplus brew install --cask kap brew install --cask vlc brew install --cask notion +brew install --cask google-drive +brew install --cask bluesnooze # disables bluetooth when sleeping # dev brew install --cask visual-studio-code brew install --cask iterm2 -brew install --build-from-source fnm brew install --cask postman brew install --cask sequel-ace brew install --cask docker @@ -39,5 +36,5 @@ brew install --cask docker # brew install --cask imagealpha # brew install --cask imageoptim -# not on cask but much wanted +# not on cask # pastebox diff --git a/brew.sh b/brew.sh index 0b90cd2..aba98d7 100755 --- a/brew.sh +++ b/brew.sh @@ -30,9 +30,6 @@ brew install bash brew install bash-completion -# deprecated -# brew install homebrew/completions/brew-cask-completion - # Install `wget` with IRI support. brew install wget @@ -52,24 +49,25 @@ brew install z # https://github.com/so-fancy/diff-so-fancy brew install diff-so-fancy -# mysql autocomplete (https://github.com/dbcli/mycli) -brew install mycli - # Install other useful binaries brew install fzf brew install git -brew install imagemagick brew install speedtest-cli brew install tree brew install ffmpeg brew install mas -brew install exa # https://bsago.me/exa/ +brew install eza # https://github.com/eza-community/eza brew install ncdu # find where your diskspace went brew install awscli brew install bat brew install jq brew install terraform brew install lsd # https://github.com/Peltoche/lsd +brew install fnm # node version manager +brew install atuin + +brew install rust +brew install deno brew install zsh diff --git a/setup-a-new-machine.sh b/setup-a-new-machine.sh index 04066a6..5f296a4 100644 --- a/setup-a-new-machine.sh +++ b/setup-a-new-machine.sh @@ -43,7 +43,7 @@ fi ############################################################################################################## # install homebrew -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" # install all the things ./brew.sh @@ -54,12 +54,6 @@ fi # autocompletion for git branch names https://git-scm.com/book/en/v1/Git-Basics-Tips-and-Tricks curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o ~/.git-completion.bash -# github.com/rupa/z - oh how i love you -# git clone https://github.com/rupa/z.git ~/code/z -# chmod +x ~/code/z/z.sh -# consider reusing your current .z file if possible. it's painful to rebuild :) -# z is hooked up in .bash_profile - # for the c alias (syntax highlighted cat) sudo easy_install Pygments @@ -71,9 +65,6 @@ chsh -s $BASHPATH # will set for current user only. echo $BASH_VERSION # should be 4.x not the old 3.2.X # Later, confirm iterm settings aren't conflicting. -# install nvm -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash - # set up osx defaults sh .macos