From 8108b0ec804665f67ef2971a3ed5f8a86a349ba1 Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Thu, 25 Nov 2021 01:36:42 +0000 Subject: [PATCH 1/8] Update license, readme --- LICENSE-MIT.txt | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt index 760b382..9208509 100644 --- a/LICENSE-MIT.txt +++ b/LICENSE-MIT.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 Pedro Machado Santa +Copyright (c) 2021 Pedro Machado Santa Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b34e60b..7563f5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ⚙ pedrosanta / dotfiles +# ⚙️ pedrosanta / dotfiles My collection of configuration and dotfiles, mostly set to work with **macOS**, **bash** shell and native **Terminal.app**, so if your preferences differ YMMV. It makes use of [GNU Stow](https://www.gnu.org/software/stow/), a very simple and interesting symlink tool [particularly useful to help manage dotfiles repositories](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html). From 8c616caa8f4463b6692f6b0a0ff4ce1afa426534 Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Thu, 25 Nov 2021 01:40:04 +0000 Subject: [PATCH 2/8] Update scope to zsh on readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7563f5f..9359626 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ⚙️ pedrosanta / dotfiles -My collection of configuration and dotfiles, mostly set to work with **macOS**, **bash** shell and native **Terminal.app**, so if your preferences differ YMMV. +My collection of configuration and dotfiles, mostly set to work with **macOS**, **zsh** shell and native **Terminal.app**, so if your preferences differ YMMV. It makes use of [GNU Stow](https://www.gnu.org/software/stow/), a very simple and interesting symlink tool [particularly useful to help manage dotfiles repositories](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html). From 60139bd139e8a3d138b5a599b4f9930063eb4d24 Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Thu, 25 Nov 2021 02:20:56 +0000 Subject: [PATCH 3/8] Add zsh config, update install script --- install.sh | 4 ++-- zsh/.zshrc | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 zsh/.zshrc diff --git a/install.sh b/install.sh index ed9fd5f..4f69ec4 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/zsh -stow --ignore ".DS_Store" bash +stow --ignore ".DS_Store" zsh stow --ignore ".DS_Store" sublime \ No newline at end of file diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..7aa1403 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,7 @@ +if type brew &>/dev/null +then + FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}" + + autoload -Uz compinit + compinit +fi \ No newline at end of file From acf9554eddb7728cc998e3721f6ceb01069d576f Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Thu, 25 Nov 2021 04:14:38 +0000 Subject: [PATCH 4/8] Update brew script --- brew.sh | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/brew.sh b/brew.sh index 0b4fa0b..bf25c23 100755 --- a/brew.sh +++ b/brew.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/zsh # Make sure we're using the latest Homebrew. brew update @@ -7,42 +7,40 @@ brew update brew upgrade # Install packages -brew install git # System git it's ok, but we install this to get and load the git bash auto complete script -brew install bash-completion +brew install zsh-completions brew install stow # Install completions. -brew install docker-completion -brew install docker-compose-completion +#brew install docker-completion +#brew install docker-compose-completion -# Install Homebrew legacy cask versions tap. See https://github.com/Homebrew/homebrew-cask-versions -# Needed for 1password6 cask. -brew tap homebrew/cask-versions - -# Install binary Caskroom 'casks' +# Install casks ## System Essentials -brew cask install itsycal -brew cask install skyfonts -brew cask install java # Meh. +brew install itsycal ## Other -brew cask install dropbox -brew cask install 1password6 -brew cask install google-chrome -brew cask install spotify -brew cask install spotify-notifications -brew cask install sublime-text -brew cask install docker -brew cask install sourcetree -brew cask install kitematic -brew cask install steam -brew cast install whatsapp -brew cask install skype # Meh. -brew cask install typora -brew cask install duet -brew cask install cyberduck -brew cask install transmission -brew cask install vlc -brew cask install keka +brew install 1password +brew install google-chrome +brew install sublime-text +brew install sublime-merge +brew install sourcetree +brew install typora +brew install --cask docker +brew install slack +brew install signal +brew install whatsapp +brew install skype +brew install google-drive +brew install dropbox +brew install microsoft-office +brew install adobe-creative-cloud +brew install spotify +brew install surfshark +brew install cloudflare-warp +brew install keka +brew install cyberduck +brew install pingplotter +brew install vlc +brew install transmission # Remove outdated versions from the cellar brew cleanup From 7d057db70f444bf70ade5d7c68a46b6208fa1000 Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Fri, 26 Nov 2021 01:30:54 +0000 Subject: [PATCH 5/8] Fix transmission install on brew script --- brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brew.sh b/brew.sh index bf25c23..d0b7775 100755 --- a/brew.sh +++ b/brew.sh @@ -40,7 +40,7 @@ brew install keka brew install cyberduck brew install pingplotter brew install vlc -brew install transmission +brew install --cask transmission # Remove outdated versions from the cellar brew cleanup From ce06930a562bf25fb715c7409236fde42973d39c Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Sat, 27 Nov 2021 02:05:26 +0000 Subject: [PATCH 6/8] Add nvm code to zsh init --- zsh/.zshrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 7aa1403..3b32a69 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -4,4 +4,8 @@ then autoload -Uz compinit compinit -fi \ No newline at end of file +fi + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion From 29451e7ff908de915bdee0b32896442324e2b7bd Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Fri, 18 Feb 2022 11:14:10 +0000 Subject: [PATCH 7/8] Add wget to brew packages --- brew.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/brew.sh b/brew.sh index d0b7775..592a90e 100755 --- a/brew.sh +++ b/brew.sh @@ -7,6 +7,7 @@ brew update brew upgrade # Install packages +brew install wget brew install zsh-completions brew install stow From c44292f4831005bc72bc7c6fdb7484bf1b5d50cb Mon Sep 17 00:00:00 2001 From: Pedro Machado Santa Date: Fri, 18 Feb 2022 13:47:23 +0000 Subject: [PATCH 8/8] Update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9359626..d08ee86 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ Here are some more resources on dotfiles I think may be worth looking to: - [mathiasbynens/dotfiles](https://github.com/mathiasbynens/dotfiles), dotfiles repository and sensible hacker defaults for macOS; - [webpro/awesome-dotfiles](https://github.com/webpro/awesome-dotfiles), a curated list of dotfiles resources inspired by the awesome list; - And of course, [the huge list of dotfiles repositories on GitHub](https://github.com/search?q=dotfiles&s=stars&type=Repositories) to draw more ideas and inspiration; +- [Compreensive guide on zsh configuration](https://thevaluable.dev/zsh-install-configure-mouseless/); ## License