Move Git config to git/, rename bin/ to config/, fix init/.gituser

.github/workflows/pr.yml

@@ -14,15 +14,15 @@ concurrency:
 
 jobs:
   ci:
-    uses: FrancesCoronel/workflows/.github/workflows/ci-shell.yml@v1
+    uses: FrancesCoronel/workflows/.github/workflows/ci-shell.yml@b502794c5982ebf06a46d13abc515a61eaf384e7 # v1
 
   security:
-    uses: FrancesCoronel/workflows/.github/workflows/security.yml@v1
+    uses: FrancesCoronel/workflows/.github/workflows/security.yml@b502794c5982ebf06a46d13abc515a61eaf384e7 # v1
 
   dependabot:
     needs: [ci, security]
     if: github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]'
-    uses: FrancesCoronel/workflows/.github/workflows/dependabot-automerge.yml@v1
+    uses: FrancesCoronel/workflows/.github/workflows/dependabot-automerge.yml@b502794c5982ebf06a46d13abc515a61eaf384e7 # v1
     permissions:
       contents: write
       pull-requests: write

AGENTS.md

@@ -16,12 +16,14 @@ Frances's macOS setup: shell configs, Homebrew casks, fonts, terminal themes and
 |---|---|
 | `bootstrap.sh` | Entry point: Homebrew, core formulae, bash files |
 | `init/.casks`, `.fonts`, `.npm`, `.osx`, `.shell`, `.gituser` | Install steps, run one at a time with `sh ~/.dotfiles/init/<name>` (see README) |
-| `bin/shell/` | Shell dotfiles copied into `$HOME` (`.zshrc`, `.bashrc`, ...), plus `zsh/.p10k.zsh` and terminal themes for Hyper, iTerm and Terminal |
-| `bin/fonts/` | Font files installed by `init/.fonts` |
-| `bin/alfred/`, `bin/tower/` | App themes |
-| `.github/.gitconfig`, `.github/.gitignore` | Global Git config and ignore file (not GitHub settings, despite the folder) |
-
-Despite the name, nothing in `bin/` is an executable. If you move a file, update every script that copies it (search `bootstrap.sh` and `init/` for the path).
+| `config/shell/` | Shell dotfiles copied into `$HOME` (`.zshrc`, `.bashrc`, ...), plus `zsh/.p10k.zsh` and terminal themes for Hyper, iTerm and Terminal |
+| `config/fonts/` | Font files installed by `init/.fonts` |
+| `config/alfred/`, `config/tower/` | App themes |
+| `git/.gitconfig` | Global Git config, copied to `~/.gitconfig` by option 3 of `init/.gituser` |
+| `git/gitignore_global` | Global ignore patterns, kept for reference; no script installs it |
+| `.github/` | GitHub settings only: workflows, Dependabot, community files |
+
+If you move a file, update every script that copies it (search `bootstrap.sh` and `init/` for the path).
 
 ## Making changes
 

README.md

@@ -147,20 +147,20 @@ Once the theme has loaded, you might want to replace the shell's startup command
 Copy Hyper configuration file to the root folder.
 
 ```bash
-mv ~Dropbox/Code/dotfiles/bin/shell/hyper/hyper.config.js ~/.hyper.js
+mv ~Dropbox/Code/dotfiles/config/shell/hyper/hyper.config.js ~/.hyper.js
 ```
 
 ![Hyper](https://i.imgur.com/Qvej6BG.png)
 
 #### iTerm 2
 
-Set up sync folder in Preferences to `~/Dropbox/Code/dotfiles/bin/shell/iterm` under `General > Preferences`.
+Set up sync folder in Preferences to `~/Dropbox/Code/dotfiles/config/shell/iterm` under `General > Preferences`.
 
 ![iTerm 2](https://i.imgur.com/8XcQqsh.png)
 
 #### Terminal
 
-Import `Materialize.terminal` profile from `~/Dropbox/Code/dotfiles/bin/shell/terminal/Materialize.terminal`.
+Import `Materialize.terminal` profile from `~/Dropbox/Code/dotfiles/config/shell/terminal/Materialize.terminal`.
 
 ![Terminal](https://i.imgur.com/kaqt9BC.png)
 

bootstrap.sh

@@ -83,9 +83,9 @@ install_formula () {
   echo "${LGREEN}Cleaning up Homebrew installation...${NC}"
   brew cleanup
 
-  cp -rf "${DOTFILES}/bin/shell/.bashrc" "$HOME/.bashrc"
-  cp -rf "${DOTFILES}/bin/shell/.bash_aliases" "$HOME/.bash_aliases"
-  cp -rf "${DOTFILES}/bin/shell/.bash_profile" "$HOME/.bash_profile"
+  cp -rf "${DOTFILES}/config/shell/.bashrc" "$HOME/.bashrc"
+  cp -rf "${DOTFILES}/config/shell/.bash_aliases" "$HOME/.bash_aliases"
+  cp -rf "${DOTFILES}/config/shell/.bash_profile" "$HOME/.bash_profile"
 
   echo "${LGREEN}Installing Caskroom, Caskroom versions, Caskroom Fonts and Brew Services${NC}"
 

.github/.gitignore → git/gitignore_global

@@ -45,12 +45,12 @@ Thumbs.db
 nbproject
 *.sublime-project
 *.sublime-workspace
-bin/shell/.DS_Store
-bin/subl/User/WakaTime.sublime-settings
+config/shell/.DS_Store
+config/subl/User/WakaTime.sublime-settings
 01524fae79697630d0454ba3fabd9414.info
-bin/subl/User/Package Control.system-ca-bundle
+config/subl/User/Package Control.system-ca-bundle
 Package Control.system-ca-bundle
-bin/screensaver/.DS_Store
+config/screensaver/.DS_Store
 Package Control.user-ca-bundle
 
 # Alfred Workflow - Spotify

init/.fonts

@@ -25,10 +25,10 @@ brew install font-input --cask
 
 echo ""
 echo "Copying over Latina Essential font..."
-cp -RfXv "$DOT"/bin/fonts/Latina-Essential ~/Library/Fonts/
+cp -RfXv "$DOT"/config/fonts/Latina-Essential ~/Library/Fonts/
 
 echo ""
 echo "Copying over MesloLGS font..."
-cp -RfXv "$DOT"/bin/fonts/MesloLGS ~/Library/Fonts/
+cp -RfXv "$DOT"/config/fonts/MesloLGS ~/Library/Fonts/
 
 brew cleanup

init/.gituser

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+DOT="$HOME/.dotfiles"
 SSHCONFIG="$HOME/.ssh/config"
 
 # Configure nano as default editor
@@ -27,7 +28,7 @@ echo ""
 
 function setdefaultgitconfig () {
   echo "Copying over existing Git config"
-  cp -RfXv "$DOT/bin/.github/.gitconfig" "$HOME/.gitconfig"
+  cp -RfXv "$DOT/git/.gitconfig" "$HOME/.gitconfig"
   echo "Okay all good"
 }
 

init/.shell

@@ -4,11 +4,11 @@ DOTFILES="$HOME/.dotfiles"
 
 echo ""
 echo "Initializing .bash_aliases"
-cp "${DOTFILES}/bin/shell/.bash_aliases" "$HOME/.bash_aliases"
+cp "${DOTFILES}/config/shell/.bash_aliases" "$HOME/.bash_aliases"
 
 echo ""
 echo "Initializing .bash_profile"
-cp "${DOTFILES}/bin/shell/.bash_profile" "$HOME/.bash_profile"
+cp "${DOTFILES}/config/shell/.bash_profile" "$HOME/.bash_profile"
 
 echo ""
 echo "Downloading asciinema to record terminal sessions"
@@ -38,7 +38,7 @@ xcode-select --install
 # Open Terminal Settings
 echo ""
 echo "Install Materialize Theme for Terminal"
-open "${DOTFILES}/bin/shell/terminal/Materialize.terminal"
+open "${DOTFILES}/config/shell/terminal/Materialize.terminal"
 sleep 1 # Wait a bit to make sure the theme is loaded
 
 # Set Terminal Custom Theme
@@ -49,14 +49,14 @@ defaults write com.apple.terminal "Startup Window Settings" -string "Materialize
 
 echo ""
 echo "Install ZSH config"
-cp "${DOTFILES}/bin/shell/.zshrc" "$HOME/.zshrc"
+cp "${DOTFILES}/config/shell/.zshrc" "$HOME/.zshrc"
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
 echo ""
 echo "Install Powerlevel config"
 brew install powerlevel10k
-cp "${DOTFILES}/bin/shell/zsh/.p10k.zsh" "$HOME/.p10k.zsh"
-cp "${DOTFILES}/bin/shell/.zprofile" "/Users/$USER/.zprofile"
+cp "${DOTFILES}/config/shell/zsh/.p10k.zsh" "$HOME/.p10k.zsh"
+cp "${DOTFILES}/config/shell/.zprofile" "/Users/$USER/.zprofile"
 source ~/.zshrc
 # p10k configure
 
@@ -87,10 +87,10 @@ source ~/.zshrc
 
 echo ""
 echo "Setting up zsh profile"
-cp "${DOTFILES}/bin/shell/.zprofile" "$HOME/.zprofile"
+cp "${DOTFILES}/config/shell/.zprofile" "$HOME/.zprofile"
 
 echo "Setting up zsh environment"
-cp "${DOTFILES}/bin/shell/.zshenv" "$HOME/.zshenv"
+cp "${DOTFILES}/config/shell/.zshenv" "$HOME/.zshenv"
 source "$HOME/.zshenv"
 
 echo ""