Skip to content

Commit

Permalink
apply fixes to some broken apps/scripts on macOS sonoma
Browse files Browse the repository at this point in the history
  • Loading branch information
jpcercal committed Mar 1, 2024
1 parent 96c3b7d commit aec6c0f
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 62 deletions.
41 changes: 31 additions & 10 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ jobs:
pattern: "*.sh"
exclude: "./.git/*"
check_all_files_with_shebangs: "false"
dotfiles:
name: dotfiles

software_update:
name: Software Update
runs-on: macos-latest
steps:
- name: Checkout
Expand All @@ -26,14 +27,34 @@ jobs:
- name: install software updates
run: make software_update

- name: install dependencies
run: make install_dependencies
install:
name: Install Dependencies and Apps
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: install dependencies
run: make install_dependencies

- name: install apps
run: make install_apps

config:
name: Install Dependencies and Apps
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: install dependencies
run: make install_dependencies

- name: install apps
run: make install_apps
- name: configure apps
run: make configure_apps

- name: configure apps
run: make configure_apps
- name: apply custom preferences
run: make apply_preferences

- name: apply custom preferences
run: make apply_preferences
- name: update history of executed commands
run: make update_history_commands
8 changes: 6 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
export PATH="/opt/homebrew/bin:~/dotfiles/bin:$PATH"

###########################################################
# homebrew

eval "$(/opt/homebrew/bin/brew shellenv)"

###########################################################
# flags
Expand Down Expand Up @@ -34,7 +38,7 @@ export LDFLAGS="-L$(brew --prefix ruby)/lib $LDFLAGS"
# python

export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"

###########################################################
Expand Down
55 changes: 23 additions & 32 deletions apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,47 @@ install:
- "automake"
- "autozimu/homebrew-formulas/unison-fsmonitor"
- "awscli"
- "balena-cli"
- "bash-completion"
- "bash"
- "bat"
- "bitwarden-cli"
- "composer"
- "coreutils"
- "dockutil"
- "doctl"
- "exa"
- "exiftool"
- "fd"
- "fdupes"
- "ffmpeg"
- "findutils"
- "fswatch"
- "fzf"
- "gdrive"
- "gist"
- "git-delta"
- "git-lfs"
- "git"
- "gmp"
- "gnu-sed"
- "go"
- "golangci-lint"
- "homebrew/cask/httpie"
- "homebrew/core/exiftool"
- "homebrew/core/go"
- "homebrew/core/nmap"
- "homebrew/core/node"
- "homebrew/core/terraform"
- "howdoi"
- "hr"
- "htmlq"
- "htop"
- "httpie"
- "imagemagick"
- "jq"
- "kubectx"
- "links"
- "lynx"
- "mas"
- "moreutils"
- "neovim"
- "ngrok"
- "nmap"
- "node"
- "nvm"
- "openssh"
- "php-code-sniffer"
Expand All @@ -60,19 +62,21 @@ install:
- "phpstan"
- "plumber"
- "pyenv"
- "python"
- "rclone"
- "ripgrep"
- "rsync"
- "screen"
- "speedtest-cli"
- "starship"
- "taskwarrior-tui"
- "terraform"
- "tldr"
- "tmux"
- "tpm"
- "tree"
- "trivy"
- "unison"
- "universal-ctags"
- "urlwatch"
- "vim"
- "watch"
Expand All @@ -89,7 +93,6 @@ install:
- "alfred"
- "appcleaner"
- "authy"
- "balena-cli"
- "brave-browser"
- "discord"
- "docker"
Expand Down Expand Up @@ -148,13 +151,12 @@ install:
- "google-chrome"
- "hiddenbar"
- "hoppscotch"
- "hpedrorodrigues/tools/dockutil" # temporary solution https://github.com/kcrawford/dockutil/issues/127
- "httpie"
- "imageoptim"
- "iterm2"
- "jetbrains-toolbox"
- "kindle"
- "kubectx"
- "macs-fan-control"
- "microsoft-teams"
- "monitorcontrol"
- "moonlight"
- "mysqlworkbench"
Expand All @@ -171,34 +173,24 @@ install:
- "tableplus"
- "taskwarrior-pomodoro"
- "teamviewer"
- "trivy"
- "visual-studio-code"
- "vlc"
- "vnc-viewer"
- "whatsapp"
- "zoom"
customCommands:
- "brew install --HEAD universal-ctags/universal-ctags/universal-ctags"
- "brew link --force git"
- "brew link --overwrite awscli"
- "brew link --overwrite go"
- "brew link --overwrite [email protected]"
- "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
- "echo \"y\" | $(brew --prefix)/opt/fzf/install"
- "git lfs install"
- "go install github.com/oklog/ulid/v2/cmd/ulid@latest"
- "mkdir ~/.nvm"
- "mkdir -p ~/.config/tmux/"
- "mkdir -p ~/dotfiles/logs/crontab/"
- "crontab ~/dotfiles/crontab"
pyenv:
global:
version: 3.11.1
pip:
- "neovim"
- "pynvim"
versions:
- 2.7.18
- 3.11.1
- "pyenv install $(pyenv install -l | awk '{print $1}' | egrep -e '^3\\.\\d+\\.\\d+$' | tail -n 1)"
- "pyenv global $(pyenv install -l | awk '{print $1}' | egrep -e '^3\\.\\d+\\.\\d+$' | tail -n 1)"
- "pyenv exec pip install --upgrade pip"
- "pyenv exec pip install neovim pynvim"
gem:
rubygems:
- "neovim"
Expand Down Expand Up @@ -236,6 +228,8 @@ install:
name: "iMovie"
- id: "409183694"
name: "Keynote"
- id: "302584613"
name: "Kindle"
- id: "441258766"
name: "Magnet"
- id: "1575588022"
Expand Down Expand Up @@ -315,10 +309,10 @@ config:
- app: "/System/Applications/Launchpad.app"
after: "Finder"

- app: "/Applications/Safari.app"
- app: "/Applications/Brave Browser.app"
after: "Finder"

- app: "/Applications/Google Chrome.app"
- app: "/Applications/Airmail.app"
after: "Finder"

- app: "/System/Applications/Reminders.app"
Expand All @@ -327,9 +321,6 @@ config:
- app: "/System/Applications/Music.app"
after: "Finder"

- app: "/System/Applications/App Store.app"
after: "Finder"

- app: "/Applications/iTerm.app"
after: "Finder"

Expand Down
16 changes: 0 additions & 16 deletions scripts/install-apps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,6 @@ done

# ------------------------------------------------------------------------------

print::section "Python"
print::section_paragraph "Setting up python interpreter versions and installing python apps."

for versionBase64Encoded in $(yq -r '.install.pyenv.versions .[] | @base64' apps.yaml); do
print::command "pyenv install $(echo ${versionBase64Encoded} | yq '. | @base64d')"
done

print::command "pyenv global $(yq -r '.install.pyenv.global.version' apps.yaml)"
print::command "pip install --upgrade pip"

for packageBase64Encoded in $(yq -r '.install.pyenv.global.pip .[] | @base64' apps.yaml); do
print::command "pip install $(echo ${packageBase64Encoded} | yq '. | @base64d')"
done

# ------------------------------------------------------------------------------

print::section "Ruby Gems"
print::section_paragraph "Installing local or remote ruby gems."

Expand Down
2 changes: 1 addition & 1 deletion scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ print::section_paragraph "Grab a cup of coffee and relax, this script does not e
print::command "/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"" "Installing homebrew." "0"
echo "y" | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

print::command "export PATH=\"/opt/homebrew/bin:$PATH\"" "Adding homebrew to the \$PATH environment variable."
print::command "(echo; echo 'eval \"$(/opt/homebrew/bin/brew shellenv)\"') >> /Users/jpcercal/.zprofile && eval \"$(/opt/homebrew/bin/brew shellenv)\"" "Adding homebrew to the \$PATH environment variable."
print::command "brew update"
print::command "brew install yq"
2 changes: 1 addition & 1 deletion scripts/support-print.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ print::command() {
fi

local start=`date +%s`
/bin/bash -c "${COMMAND}"
eval "${COMMAND}"
local is_success=$?

local end=`date +%s`
Expand Down

0 comments on commit aec6c0f

Please sign in to comment.