Skip to content

Commit

Permalink
Several improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
martijngastkemper committed Mar 18, 2024
1 parent 040b665 commit 4881bfd
Show file tree
Hide file tree
Showing 8 changed files with 824 additions and 235 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: shellcheck -- bin/* *.sh git_template/hooks/* bash_aliases

actionlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check workflow files
run: |
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
Expand Down
60 changes: 0 additions & 60 deletions .github/workflows/test-installation.yml

This file was deleted.

12 changes: 7 additions & 5 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
tap "homebrew/core"
tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/bundle"
tap "shivammathur/php"
tap "universal-ctags/universal-ctags"
brew "awscli"
cask "font-menlo-for-powerline"
Expand All @@ -11,9 +10,11 @@ brew "gnupg"
brew "inetutils"
cask "iterm2"
brew "jq"
brew "[email protected]", link: true
brew "[email protected]"
brew "[email protected]"
brew "mysql"
brew "shivammathur/php/[email protected]"
brew "shivammathur/php/[email protected]"
brew "[email protected]"
brew "[email protected]"
brew "php"
brew "pinentry-mac"
brew "[email protected]"
Expand All @@ -23,5 +24,6 @@ brew "sqlite"
brew "tmux"
brew "universal-ctags", args: ['HEAD']
brew "vim"
brew "wget"
brew "zsh"
cask "1password"
965 changes: 806 additions & 159 deletions Brewfile.lock.json

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ all:
installed_%:
@which $* > /dev/null

.PHONY = install_brew
install_brew: installed_ruby
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

.PHONY = install_brew_packages
install_brew_packages: installed_brew
install_brew_packages:
brew update
brew bundle install

Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ Get the port for MySQL

### Step 1: Dotfiles

$ git clone git://github.com/martijngastkemper/dotfiles ~/.dotfiles
$ git clone git@github.com/martijngastkemper/dotfiles.git ~/.dotfiles
$ # when git is not available install brew (brew.sh), this will install git on MacOS
$ cd ~/.dotfiles
$ make symlinks

### Step 2: Brew

$ make install_brew
Follow the installation instructions on [brew.sh](https://brew.sh).

$ make install_brew_packages

### Step 3: Shell
Expand All @@ -78,7 +79,7 @@ Start tmux before configuring it.
### Step 6: Node

$ make install_nvm
$ nvm install 12
$ nvm install 20
$ make install_yarn

### Step 7: Composer
Expand Down Expand Up @@ -142,6 +143,7 @@ The plugins I use:
- IdeaVim
- Makefile support
- Prettier
- Terraform and HCL

## Find domain and key for usage in ``defaults``

Expand Down
2 changes: 1 addition & 1 deletion gnupg/gpg-agent.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pinentry-program /usr/local/bin/pinentry-mac
pinentry-program /opt/homebrew/bin/pinentry-mac
2 changes: 2 additions & 0 deletions iterm2/com.googlecode.iterm2.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AllowClipboardAccess</key>
<true/>
<key>AlternateMouseScroll</key>
<true/>
<key>Default Arrangement Name</key>
Expand Down

0 comments on commit 4881bfd

Please sign in to comment.