Merge pull request #118 from atomantic/codex/investigate-issue-#89-in-dotfiles

Fix brew default names issue

Author: atomantic

README.md

@@ -253,68 +253,11 @@ The following will only happen if you agree on the prompt
 - Disable automatic emoji substitution (i.e. use plain text smileys)
 - Disable smart quotes as it’s annoying for messages that contain code
 
-## SizeUp.app
-
-- Start SizeUp at login
-- Don’t show the preferences window on next start
 
 # Software Installation
 
 homebrew, fontconfig, git, nvm (node + npm), and zsh (latest) are all installed inside the `install.sh` as foundational software for running this project.
 Additional software is configured in `config.js` and can be customized in your own fork/branch (you can change everything in your own fork/brance).
-The following is the software that I have set as default:
-
-## Utilities
-
-- ack
-- ag
-- coreutils
-- dos2unix
-- findutils
-- fortune
-- gawk
-- gifsicle
-- gnupg
-- gnu-sed
-- homebrew/dupes/grep
-- httpie
-- imagemagick (only if gitshots enabled)
-- imagesnap (only if gitshots enabled)
-- jq
-- mas
-- moreutils
-- nmap
-- openconnect
-- reattach-to-user-namespace
-- homebrew/dupes/screen
-- tmux
-- tree
-- ttyrec
-- vim --override-system-vi
-- watch
-- wget --enable-iri
-
-## Apps
-
-- box-sync
-- gpgtools
-- iterm2
-- sizeup
-- slack
-- the-unarchiver
-- xquartz
-
-## NPM Global Modules
-
-- antic
-- buzzphrase
-- eslint
-- gulp
-- instant-markdown-d
-- npm-check
-- prettyjson
-- trash
-- vtop
 
 # License
 

config.js

@@ -7,8 +7,7 @@ export default {
     "autojump",
     // alternative to `cat`: https://github.com/sharkdp/bat
     "bat",
-    // Install GNU core utilities (those that come with macOS are outdated)
-    // Don’t forget to add `$(brew --prefix coreutils)/libexec/gnubin` to `$PATH`.
+    // Install GNU core utilities (PATH updated automatically during install)
     "coreutils",
     "dos2unix",
     // Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed
@@ -20,13 +19,10 @@ export default {
     // http://www.lcdf.org/gifsicle/ (because I'm a gif junky)
     "gifsicle",
     "gnupg",
-    // Install GNU `sed`, overwriting the built-in `sed`
-    // so we can do "sed -i 's/foo/bar/' file" instead of "sed -i '' 's/foo/bar/' file"
-    "gnu-sed --with-default-names",
-    // upgrade grep so we can get things like inverted match (-v)
-    "grep --with-default-names",
-    // better, more recent grep
-    "homebrew/dupes/grep",
+    // Install GNU `sed` (PATH updated automatically during install)
+    "gnu-sed",
+    // Install GNU grep (PATH updated automatically during install)
+    "grep",
     // https://github.com/jkbrzt/httpie
     "httpie",
     // jq is a sort of JSON grep
@@ -69,7 +65,7 @@ export default {
     //'micro-snitch',
     // 'signal',
     //'macvim',
-    "sizeup",
+    // "sizeup",
     //'sketchup',
     "slack",
     // 'the-unarchiver',

homedir/.shellpaths

@@ -4,6 +4,7 @@ export PATH=$PATH:.
 
 #Brew
 export PATH="/opt/homebrew/bin:$PATH"
+# GNU utilities will be added by install.sh
 # export PATH=/usr/local/sbin:$PATH
 # export PATH=/usr/local/bin:$PATH
 
@@ -15,3 +16,6 @@ export PATH="/opt/homebrew/bin:$PATH"
 
 # The next line enables shell command completion for gcloud.
 #source "/Users/$(whoami)/Downloads/google-cloud-sdk/completion.zsh.inc"
+export PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/grep/libexec/gnubin:$PATH"

homedir/.zshrc

@@ -61,4 +61,4 @@ export GEMINI_SANDBOX=docker
 
 # NVM initialization (added by install.sh)
 export NVM_DIR="$HOME/.nvm"
-[ -s "$(brew --prefix nvm)/nvm.sh" ] && \. "$(brew --prefix nvm)/nvm.sh"
+[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"

install.sh

@@ -200,6 +200,27 @@ fi
 mkdir -p ~/Library/Caches/Homebrew/Formula
 brew doctor
 
+# Add GNU utilities to PATH once in .shellpaths
+shellpaths_file="./homedir/.shellpaths"
+
+# Determine Homebrew prefix once using brew
+brew_prefix="$(brew --prefix)"
+
+# Append gnubin directories for GNU utilities if missing
+coreutils_path="$brew_prefix/opt/coreutils/libexec/gnubin"
+sed_path="$brew_prefix/opt/gnu-sed/libexec/gnubin"
+grep_path="$brew_prefix/opt/grep/libexec/gnubin"
+
+if ! grep -qs "$coreutils_path" "$shellpaths_file"; then
+  echo "export PATH=\"$coreutils_path:\$PATH\"" >> "$shellpaths_file"
+fi
+if ! grep -qs "$sed_path" "$shellpaths_file"; then
+  echo "export PATH=\"$sed_path:\$PATH\"" >> "$shellpaths_file"
+fi
+if ! grep -qs "$grep_path" "$shellpaths_file"; then
+  echo "export PATH=\"$grep_path:\$PATH\"" >> "$shellpaths_file"
+fi
+
 # skip those GUI clients, git command-line all the way
 # git is now included with macos terminal
 #require_brew git
@@ -1073,15 +1094,15 @@ defaults write com.apple.messageshelper.MessageController SOInputLineSettings -d
 # running "Disable continuous spell checking"
 # defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false;ok
 
-###############################################################################
-bot "SizeUp.app"
-###############################################################################
+# ###############################################################################
+# bot "SizeUp.app"
+# ###############################################################################
 
-running "Start SizeUp at login"
-defaults write com.irradiatedsoftware.SizeUp StartAtLogin -bool true;ok
+# running "Start SizeUp at login"
+# defaults write com.irradiatedsoftware.SizeUp StartAtLogin -bool true;ok
 
-running "Don't show the preferences window on next start"
-defaults write com.irradiatedsoftware.SizeUp ShowPrefsOnNextStart -bool false;ok
+# running "Don't show the preferences window on next start"
+# defaults write com.irradiatedsoftware.SizeUp ShowPrefsOnNextStart -bool false;ok
 
 killall cfprefsd