refactor!: use stow

.config/nvim/lua/casraf/plugins/remap.lua

@@ -284,9 +284,9 @@ local function nope()
   vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Make file executable" })
   vim.keymap.set("n", "<leader>X", "<cmd>!chmod -x %<CR>", { silent = true, desc = "Make file not executable" })
 
-  vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.dotfiles/.config/nvim/lua/casraf/packer.lua<CR>",
-    { desc = "Edit packer config" });
-  vim.keymap.set("n", "<leader>vpr", "<cmd>e ~/.dotfiles/.config/nvim/lua/casraf/remap.lua<CR>",
+  vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.config/nvim/lua/casraf/plugins/init.lua<CR>",
+    { desc = "Edit plugins config" });
+  vim.keymap.set("n", "<leader>vpr", "<cmd>e ~/.config/nvim/lua/casraf/plugins/remap.lua<CR>",
     { desc = "Edit remaps" });
   -- vim.keymap.set("n", "<leader>mir", "<cmd>CellularAutomaton make_it_rain<CR>", { desc = "Make it rain" });
   -- vim.keymap.set("n", "<leader>gol", "<cmd>CellularAutomaton game_of_life<CR>", { desc = "Game of life" });

.config/sofmani.yml

@@ -25,35 +25,6 @@ install:
   # - category: 🧰 Configs & Dotfiles
   #   desc: Installers that sync dotfiles or apply local system configurations.
 
-  - name: .config
-    type: rsync
-    tags: config dotfiles sofmani-config
-    skip_summary:
-      update: true
-    opts:
-      source: $DOTFILES/.config/
-      destination: ~/.config/
-      flags: --exclude lazygit.yml --exclude nvim --exclude .git --exclude .DS_Store --exclude 'tmux_*.yml'
-
-  - name: editorconfig
-    type: rsync
-    tags: config dotfiles
-    skip_summary:
-      update: true
-    opts:
-      source: $DOTFILES/.editorconfig.global
-      destination: ~/.editorconfig
-
-  - name: nvim-config
-    type: rsync
-    tags: config nvim-config
-    skip_summary:
-      update: true
-    opts:
-      source: $DOTFILES/.config/nvim/
-      destination: ~/.config/nvim/
-      flags: --delete --exclude .git --exclude .DS_Store
-
   - name: tmux-config
     type: shell
     tags: config tmux
@@ -69,21 +40,22 @@ install:
   - name: tx-config
     type: shell
     tags: config tmux
-    enabled: test -f "$DOTFILES/.config/tmux_{{ .DeviceIDAlias }}.yml"
+    enabled: test -f "$HOME/.config/tmux_{{ .DeviceIDAlias }}.yml"
     check_installed: test -f ~/.config/tmux_local.yml
-    check_has_update: '! diff -q "$DOTFILES/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml > /dev/null 2>&1'
+    check_has_update: '! diff -q "$HOME/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml > /dev/null 2>&1'
     opts:
-      command: cp "$DOTFILES/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml
-      update_command: cp "$DOTFILES/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml
+      command: cp "$HOME/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml
+      update_command: cp "$HOME/.config/tmux_{{ .DeviceIDAlias }}.yml" ~/.config/tmux_local.yml
 
   - name: lazygit-config
-    type: rsync
+    type: shell
     tags: lazygit lazygit-config config
     skip_summary:
       update: true
     opts:
-      source: $DOTFILES/.config/lazygit.yml
-      destination: $LAZYGIT_HOME/config.yml
+      check_installed: test -L "$LAZYGIT_HOME/config.yml"
+      command: ln -sf "$HOME/.config/lazygit.yml" "$LAZYGIT_HOME/config.yml"
+      update_command: ln -sf "$HOME/.config/lazygit.yml" "$LAZYGIT_HOME/config.yml"
 
   - name: osx-defaults
     type: shell
@@ -150,7 +122,7 @@ install:
         git config --global gpg.format "ssh"
         git config --global gpg.ssh.allowedSignersFile "~/.ssh/allowed_signers"
         git config --global commit.gpgsign true
-        git config --global maintenance.repo "~/.dotfiles"
+        git config --global maintenance.repo "$HOME/.dotfiles.git"
         git config --global fetch.writeCommitGraph true
         git config --global log.showSignature true
         git config --global core.excludesfile ~/.config/.gitignore
@@ -500,7 +472,7 @@ install:
     opts:
       bin_name: tx
       command: |
-        cd $DOTFILES/utils
+        cd $HOME/.config/dotfiles/utils
         pnpm i && pnpm build && pnpm ginst
 
   - name: pandoc
@@ -755,15 +727,7 @@ install:
   # - category: 🔌 Zsh & Tmux Plugins
   #   desc: Git-based plugins and themes for Zsh shell and Tmux.
 
-  - name: local-plugins
-    type: rsync
-    tags: plugin config
-    post_install: source "$DOTFILES/plugins/loader.zsh"
-    post_update: source "$DOTFILES/plugins/loader.zsh"
-    opts:
-      source: ~/.dotfiles/plugins/
-      destination: ~/.local/share/zsh/plugins/local/
-      flags: --delete
+  # local-plugins: no longer needed — tracked in-place by bare repo at ~/.local/share/zsh/plugins/local/
 
   - name: mfaerevaag/wd
     type: git

.editorconfig

@@ -1,9 +1,39 @@
+root = true
+
 [*]
-tab_width = 2
-indent_size = 2
+charset = utf-8
+end_of_line = lf
 indent_style = space
+indent_size = 2
+tab_width = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.md]
+[*.{md,markdown}]
 trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.py]
+indent_size = 4
+
+[*.go]
+indent_style = tab
+
+[*.gd]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.cs]
+indent_size = 4
+
+[*.{java,kt,kts}]
+indent_size = 4
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.editorconfig.global

@@ -1,39 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 2
-tab_width = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{md,markdown}]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab
-indent_size = 4
-tab_width = 4
-
-[*.py]
-indent_size = 4
-
-[*.go]
-indent_style = tab
-
-[*.gd]
-indent_style = tab
-indent_size = 4
-tab_width = 4
-
-[*.cs]
-indent_size = 4
-
-[*.{java,kt,kts}]
-indent_size = 4
-
-[*.{yml,yaml}]
-indent_style = space
-indent_size = 2

.gitignore

@@ -11,3 +11,4 @@ plugins/.cache
 .config/local.tmux
 var/log/sofmani
 .config/tmux_local.yml
+/_plugins/.cache

.local/share/zsh/plugins/local/ascii_font/ascii_font.plugin.zsh

@@ -2,7 +2,7 @@
 
 ascii-text() {
   # ascii-font() {
-  dir="$DOTFILES/plugins/ascii_font"
+  dir="${0:A:h}"
   font="$dir/fonts/Big-Money-ne"
   size=1
   color=""

.local/share/zsh/plugins/local/common/colors.zsh

@@ -55,7 +55,7 @@ all_colors() {
     echo "Display all 256 terminal colors. Use -f to force regenerate the cache."
     return 0
   fi
-  cache_file="$DOTFILES/plugins/.cache/colors.cache"
+  cache_file="$PLUGINS_DIR/local/.cache/colors.cache"
   if [[ "$1" == "-f" ]]; then
     rm -f $cache_file
   fi

.local/share/zsh/plugins/local/common/list_functions.zsh

@@ -40,7 +40,7 @@ hscl() {
   fi
 
   # Get the plugins directory (directory of this script)
-  local plugins_dir="$DOTFILES/plugins"
+  local plugins_dir="$PLUGINS_DIR/local"
 
   # Find all script files in plugins directory and subdirectories
   local script_files=("${plugins_dir}"/**/*.zsh(N))

.local/share/zsh/plugins/local/common/markdown-preview.zsh

@@ -36,7 +36,7 @@ mdp() {
   done
 
   filename=${1:-README.md}
-  html_file="$DOTFILES/plugins/assets/mdp-template.html"
+  html_file="$PLUGINS_DIR/local/assets/mdp-template.html"
   title=$(basename $filename)
   filewoext="$(basename ${filename%.*})"
 

.stow-local-ignore

@@ -0,0 +1,24 @@
+\.git
+\.gitignore
+\.stow-local-ignore
+\.claude
+\.DS_Store
+\.device_uid
+\.github
+exports\.zsh
+aliases\.zsh
+_local\.zsh
+autoload_completions\.zsh
+completions
+_plugins
+utils
+brew
+node_modules
+pnpm-lock\.yaml
+README\.md
+\.prettierrc
+\.prettierignore
+\.eslintignore
+\.shellcheckrc
+\.config/tmux_m1\.yml
+\.config/tmux_planck\.yml

.zshrc

@@ -25,14 +25,14 @@ export DOTBIN_META="$HOME/.config/.bin"
 
 # Load sofmani-managed zsh plugins
 
-source "$DOTFILES/plugins/loader.zsh"
+source "$DOTFILES/_plugins/loader.zsh"
 
 wd() { . ~/.local/share/zsh/plugins/wd/wd.sh }
 
 source "$DOTFILES/exports.zsh"
 
 if [[ -t 0 && -t 1 ]]; then
-  [[ "$1" == "-q" ]] || run-parts "$DOTFILES/plugins/motd"
+  [[ "$1" == "-q" ]] || run-parts "$DOTFILES/_plugins/motd"
 fi
 
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.

README.md

@@ -78,26 +78,60 @@ Some (but not all) of the plugins/modifications are listed here:
 
 ## How to install
 
-1. Install zsh
+1. Install zsh and [GNU Stow](https://www.gnu.org/software/stow/)
+
+   ```bash
+   brew install stow
+   ```
+
 2. Clone this repository into `~/.dotfiles`:
 
    ```bash
    git clone git@github.com:chenasraf/dotfiles.git --depth 1 ~/.dotfiles
    ```
 
-3. Replace entire contents of `~/.zshrc` to the new version using (`ln -s` does **not** work):
+3. Symlink configs into your home directory using stow:
 
    ```bash
-   echo 'source "$HOME/.dotfiles/.zshrc"' > ~/.zshrc
+   cd ~/.dotfiles
+   stow -t ~ .
    ```
 
-4. Run install scripts:
+   This creates symlinks for `.zshrc`, `.editorconfig`, `.config/*`, `.local/share/zsh/plugins/local/*`, etc.
+   Files listed in `.stow-local-ignore` (scripts, utilities, repo metadata) are excluded.
+
+   To restow after pulling changes:
 
    ```bash
-   source ~/.dotfiles/install.zsh
+   cd ~/.dotfiles
+   stow -R -t ~ .
    ```
 
-   And reload the terminal
+4. Install tools via [sofmani](https://github.com/chenasraf/sofmani):
+
+   ```bash
+   sofmani
+   ```
+
+   This handles brew packages, git plugins, language runtimes, and other dependencies.
+
+### Structure
+
+```
+~/.dotfiles/
+├── .config/          # App configs (aerospace, alacritty, ghostty, lazygit, nvim, tmux, wezterm, ...)
+├── .local/           # Zsh plugins (stowed to ~/.local/share/zsh/plugins/local/)
+├── .editorconfig     # Global editorconfig (stowed to ~/.editorconfig)
+├── .zshrc            # Shell config (stowed to ~/.zshrc)
+├── exports.zsh       # Environment variables (sourced by .zshrc)
+├── aliases.zsh       # Shell aliases (sourced by .zshrc)
+├── completions/      # Zsh completions (added to fpath by .zshrc)
+├── _plugins/         # Plugin loader and MOTD scripts (sourced from $DOTFILES)
+├── utils/            # Build utilities
+└── .stow-local-ignore
+```
+
+Stow symlinks everything in the repo root into `~`, except items in `.stow-local-ignore` (scripts, utilities, and repo metadata that are sourced directly from `$DOTFILES`).
 
 ## My Other Stuff
 

_plugins/motd/10-logo

@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 source "$DOTFILES/aliases.zsh"
-source $DOTFILES/plugins/ascii_font/ascii_font.plugin.zsh
+source $DOTFILES/_plugins/ascii_font/ascii_font.plugin.zsh
 
 if [[ $(hostname) == 'spider.casraf.dev' || $(hostname) == 'spider' ]]; then
   text='spider'

aliases.zsh

@@ -87,9 +87,9 @@ alias hdiff="home git diff"
 alias hdiff1="home git diff HEAD~1"
 alias hf="home git fetch"
 alias hp="home push"
-alias hl="home pull && cp ~/.dotfiles/.config/sofmani.yml ~/.config/"
+alias hl="home pull && stow -R -t ~ ."
 alias hlog="home git log"
-alias motd="run-parts \$DOTFILES/plugins/motd"
+alias motd="run-parts \$DOTFILES/_plugins/motd"
 alias spider="ssh root@spider.casraf.dev"
 
 # docker

exports.zsh

@@ -15,10 +15,10 @@ export PLUGINS_DIR="$HOME/.local/share/zsh/plugins"
 export TMUX_PLUGINS_DIR="$HOME/.tmux/plugins"
 
 # Lazygit
-if [[ -d "$HOME/Library/ApplicationSupport/lazygit" ]]; then
-  export LAZYGIT_HOME="$HOME/Library/ApplicationSupport/lazygit"
-elif [[ -d "$HOME/.config/lazygit" ]]; then
+if [[ -d "$HOME/.config/lazygit" ]]; then
   export LAZYGIT_HOME="$HOME/.config/lazygit"
+elif [[ -d "$HOME/Library/ApplicationSupport/lazygit" ]]; then
+  export LAZYGIT_HOME="$HOME/Library/ApplicationSupport/lazygit"
 fi
 
 # Postgres.app