Skip to content

Commit

Permalink
fisher and other macos updates
Browse files Browse the repository at this point in the history
  • Loading branch information
tobymccann committed Nov 23, 2019
1 parent d9dac17 commit 4c46c1e
Show file tree
Hide file tree
Showing 19 changed files with 43,182 additions and 29 deletions.
6 changes: 1 addition & 5 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ function ask_for_sudo() {
fi
}



function install_xcode_command_line_tools() {
info "Installing Xcode command line tools"
if [[ $(xcode-select --version) ]]; then
Expand Down Expand Up @@ -241,10 +239,8 @@ function setup_tmux() {
fi

substep "Installing all plugins"

# sourcing .tmux.conf is necessary for tpm
tmux source-file ~/.tmux.conf 2> /dev/null

#tmux source-file ~/.tmux.conf 2> /dev/null
if ~/.tmux/plugins/tpm/bin/./install_plugins &> /dev/null; then
substep "Plugins installations succeeded"
else
Expand Down
2 changes: 1 addition & 1 deletion brew/Brewfile_brew
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ brew "httping"
brew "imagemagick"
brew "jq"
brew "libxml2"
brew "mas-cli/tap/mas"
brew "mas"
brew "mosh"
brew "nmap"
brew "node"
Expand Down
4 changes: 4 additions & 0 deletions brew/Brewfile_cask
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ cask "docker"
cask "dropbox"
cask "homebrew/cask-versions/firefox-developer-edition"
cask "font-fira-mono-for-powerline" # for iTerm2 powerline
cask "font-firacode-nerd-font"
cask "font-hack-nerd-font"
cask "fork"
cask "foxitreader"
cask "google-chrome"
Expand All @@ -23,12 +25,14 @@ cask "karabiner-elements"
cask "keybase"
cask "ngrok"
cask "numi"
cask "sequel-pro"
cask "skype"
cask "slack"
cask "the-unarchiver"
cask "toggl"
cask "transmission"
cask "tunnelblick"
cask "typora"
cask "virtualbox"
cask "visual-studio-code"
cask "zoomus"
1 change: 1 addition & 0 deletions brew/Brewfile_tap
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/core"
tap "homebrew/services"
tap "mas-cli/tap"
1 change: 1 addition & 0 deletions fish/completions/fisher.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fisher complete
9 changes: 9 additions & 0 deletions fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,12 @@ set -q XDG_DATA_HOME
or set --global --export OMF_PATH "$HOME/.local/share/omf"
source $OMF_PATH/init.fish


############################################################################
# Configuration for Fisher
############################################################################
if not functions -q fisher
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
fish -c fisher
end
14 changes: 14 additions & 0 deletions fish/fishfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
oh-my-fish/plugin-bang-bang
edc/bass
oh-my-fish/plugin-brew
oh-my-fish/plugin-osx
tuvistavie/fish-ssh-agent
oh-my-fish/plugin-tab
publicarray/update
orefalo/free
laughedelic/pisces
fishpkg/fish-await
fishpkg/fish-menu
jethrokuan/z
fishpkg/fish-last-job-id
rafaelrinaldi/pure
Loading

0 comments on commit 4c46c1e

Please sign in to comment.