Conversation
# Conflicts: # files/.config/nvim/lua/custom/plugins/lsp.lua
Add missing formatters (shfmt, prettier, prettierd, isort) and linters (eslint_d, hadolint, jsonlint, vale, tflint) to mason-tool-installer's ensure_installed list so they are automatically installed on fresh machines. Co-Authored-By: Claude <noreply@anthropic.com>
* origin/main: (39 commits) fix: tmux setup fix: source brew fix: .doftiles link fix: wrong installation pdfcat fix: problem with install scripts perf: improve rendering in statuscolumn and statusline feat: new simple config chore: move config feat: minor files added fix: minimal changes into after feat: some updates feat: add new nvim package manager ci: fix asserts fix: missing brew ci: fix globals feat: better git feat: update plugins style: format files fix: add nvim tests feat: toggle tree-sitter context ... # Conflicts: # .github/workflows/ci.yml # Makefile # README.md # extra/setup.sh # files/.config/kitty/kitty.conf # files/.config/nvim/after/ftplugin/markdown.lua # files/.config/nvim/after/ftplugin/qf.lua # files/.config/nvim/after/ftplugin/tex.lua # files/.config/nvim/init.lua # files/.config/nvim/lazy-lock.json # files/.config/nvim/lua/custom/plugins/bufferline.lua # files/.config/nvim/lua/custom/plugins/colorscheme.lua # files/.config/nvim/lua/custom/plugins/debug.lua # files/.config/nvim/lua/custom/plugins/filetype.lua # files/.config/nvim/lua/custom/plugins/folke.lua # files/.config/nvim/lua/custom/plugins/format.lua # files/.config/nvim/lua/custom/plugins/fzf.lua # files/.config/nvim/lua/custom/plugins/git.lua # files/.config/nvim/lua/custom/plugins/init.lua # files/.config/nvim/lua/custom/plugins/lsp.lua # files/.config/nvim/lua/custom/plugins/mini.lua # files/.config/nvim/lua/custom/plugins/navigation.lua # files/.config/nvim/lua/custom/plugins/neotree.lua # files/.config/nvim/lua/custom/plugins/noice.lua # files/.config/nvim/lua/custom/plugins/terminal.lua # files/.config/nvim/lua/custom/plugins/todo.lua # files/.config/nvim/lua/custom/plugins/treesitter.lua # files/.config/nvim/lua/custom/plugins/ui.lua # files/.config/nvim/lua/custom/plugins/whichkey.lua # files/.config/nvim/lua/dracula-pro/colors.lua # files/.config/nvim/lua/dracula-pro/config.lua # files/.config/nvim/lua/dracula-pro/groups/base.lua # files/.config/nvim/lua/dracula-pro/groups/plugins.lua # files/.config/nvim/lua/dracula-pro/groups/treesitter.lua # files/.config/nvim/lua/dracula-pro/init.lua # files/.config/nvim/lua/highlight.lua # files/.config/nvim/lua/lazyloader.lua # files/.config/nvim/lua/tools.lua # files/.config/tmux/statusbar.conf # files/.config/tmux/tmux.conf # files/.config/wezterm/wezterm.lua # files/.config/zsh/README.md # files/.config/zsh/rc.d/40-fzf.zsh # files/.config/zsh/zshenv # install.sh # install/install_dependencies.sh # nvim_old/lua/keymaps.lua # nvim_old/lua/packs/completion.lua # nvim_old/lua/packs/gaming.lua # nvim_old/lua/packs/linting.lua # nvim_old/plugin/autocommands.lua
There was a problem hiding this comment.
Pull request overview
This PR updates the dotfiles repo with a “work” setup: new MCP server wrappers + proxy/service setup scripts, a broad Dracula Pro theming pass across terminals, and a revamped install/symlink flow (migrating paths from ~/Workspaces/... to ~/Projects/...). It also adds a Neovim mini.test-based test harness and several unit/integration tests.
Changes:
- Add MCP wrappers (Neovim, filesystem, shell, GitHub, Atlassian) plus service/proxy bootstrap scripts.
- Migrate install/docs to
~/Projects/...and introduce a new Stow-basedextra/symlinks.shflow. - Add Neovim test runner + unit/integration tests; update some editor/terminal themes and plugin locks.
Reviewed changes
Copilot reviewed 64 out of 65 changed files in this pull request and generated 21 comments.
Show a summary per file
| File | Description |
|---|---|
| windows_terminal_settings.json | Add Windows Terminal settings + schemes inline |
| scripts/start-nvim-mcp | Add helper to start headless nvim server |
| scripts/shell-mcp-wrapper.sh | Add MCP shell server wrapper (WSL env) |
| scripts/setup-ai-proxy.sh | Add systemd-user setup for LiteLLM + cursor bridge |
| scripts/nvim-mcp-server-wrapper | Add wrapper to ensure nvim server is running |
| scripts/nvim-mcp-server | Add npx-based Neovim MCP server launcher |
| scripts/neovim-mcp-wrapper.sh | Add health-checked Neovim MCP wrapper |
| scripts/mcp-github-wrapper.sh | Add GitHub MCP docker wrapper |
| scripts/mcp-filesystem-wrapper.sh | Add filesystem MCP wrapper (npx server) |
| scripts/mcp-atlassian-wrapper.sh | Add Atlassian MCP wrapper (uvx) |
| scripts/login.sh | Add portable login banner/status script |
| scripts/cursor-quota | Add Cursor quota/info helper |
| scripts/copilot-quota | Add Copilot quota helper via gh api |
| scripts/aws-sso | Update AWS SSO login command |
| README.md | Update install path documentation to ~/Projects/... |
| nvim_old/plugin/autocommands.lua | Remove archive startup retry logic |
| nvim_old/lua/packs/linting.lua | Convert linting pack to plugin-spec return table |
| nvim_old/lua/packs/gaming.lua | Convert gaming pack to plugin-spec return table |
| nvim_old/lua/packs/completion.lua | Convert completion pack to plugin-spec; add deps/options |
| nvim_old/lua/keymaps.lua | Remove display-line j/k remaps |
| Makefile | Change repo root reference + install script target |
| install/install_dependencies.sh | Change pdfcat install; remove uv; run install_zsh |
| install.sh | Simplify bootstrap installer and update target directory |
| files/.zshrc | Add direnv hook, curl alias, and eza theme export |
| files/.gitconfig | Add gh credential helpers for GitHub/gist |
| files/.config/zsh/zshenv | Adjust conda lazy-loader function |
| files/.config/zsh/README.md | Update referenced install path to ~/Projects/... |
| files/.config/zsh/rc.d/90-local.zsh | Switch direnv hook invocation |
| files/.config/zsh/rc.d/60-sources.zsh | Ensure reload_zsh re-sources zshenv |
| files/.config/zsh/rc.d/40-fzf.zsh | Switch fzf theme sourcing target |
| files/.config/zsh/conda.sh | Rewrite conda bootstrap script in zsh |
| files/.config/zsh/aliases.d/misc.sh | Adjust clc alias to clear LD_LIBRARY_PATH |
| files/.config/zsh/.zshrc | Add “ensure conda wrapper exists” block |
| files/.config/zsh/.zshenv | Source global zshenv and cargo env |
| files/.config/windows-terminal/schemes/dracula-pro.json | Add Dracula Pro scheme JSON |
| files/.config/wezterm/wezterm.lua | Attempt to switch WezTerm color scheme |
| files/.config/tmux/tmux.conf | Update theme + popup binding |
| files/.config/tmux/themes/dracula-pro.tmux | Update tmux theme palette + comments |
| files/.config/tmux/statusbar.conf | Update status-right length + copilot usage segment |
| files/.config/nvim/tests/unit/test_tools.lua | Add unit tests for tools.lua pure functions |
| files/.config/nvim/tests/unit/test_strings.lua | Add unit tests for tools.strings utilities |
| files/.config/nvim/tests/unit/test_highlight.lua | Add unit tests for tint/blend/darken_hsl |
| files/.config/nvim/tests/run_tests.sh | Add test runner script (mini.test) |
| files/.config/nvim/tests/minimal_init.lua | Add minimal init to bootstrap mini.test |
| files/.config/nvim/tests/integration/test_plugins_load.lua | Add smoke test for module require() |
| files/.config/nvim/tests/integration/test_options.lua | Add integration test for options.lua |
| files/.config/nvim/tests/integration/test_lsp.lua | Add integration test for Mason registry/tools |
| files/.config/nvim/tests/integration/test_keymaps.lua | Add integration test for keymaps registration |
| files/.config/nvim/nvim-pack-lock.json | Add diffview.nvim + sailor.vim lock entries |
| files/.config/nvim/lua/custom/gh_notifications.lua | Add fzf-lua GitHub notifications picker |
| files/.config/nvim/init.lua | Enable diffview.nvim plugin |
| files/.config/mimeapps.list | Add claude-cli URL handler default |
| files/.config/kitty/kitty.conf | Switch Kitty theme include to dracula-pro |
| files/.config/ghostty/config | Switch Ghostty theme to dracula-pro |
| files/.config/claude-code/mcp_servers.json | Add Atlassian MCP server entry |
| files/.bashrc | Replace/normalize bashrc and source cargo env |
| files/.bash_profile | Source cargo env on login |
| extra/symlinks.sh | Add Stow-based symlink installer |
| extra/setup.sh | Update setup steps and tmux plugin install command |
| extra/install_docker_ubuntu.sh | Make Docker install script OS-aware (Ubuntu/Debian) |
| extra/install_aws.sh | Add AWS CLI + session manager installer (mac/linux) |
| extra/claude_desktop_config.json | Add example Claude Desktop MCP config (Ubuntu) |
| claude_desktop_config.json | Add Claude Desktop MCP config (Debian) |
| .gitignore | Ignore additional config/tool directories and LiteLLM tokens |
| .github/workflows/ci.yml | Update CI path to ~/Projects/... and lint targets |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+589
to
+592
|
|
||
| -- BEGIN_WEZTERM_THEME | ||
| config.color_scheme = 'dracula-pro' | ||
| -- END_WEZTERM_THEME |
Comment on lines
+63
to
67
|
|
||
| eval "$(${CONDA_PREFIX}/bin/conda shell.zsh hook)" | ||
| unset -f __bootstrap_conda | ||
| conda "$@" | ||
| } |
Comment on lines
+29
to
+31
| arm64 | aarch64) | ||
| conda_arch="arm64" | ||
| ;; |
Comment on lines
100
to
105
| install_dependencies | ||
| clone_dotfiles | ||
|
|
||
| # Put Homebrew on PATH for the make step (install_dependencies.sh ran brew | ||
| # shellenv in a child shell, so it didn't propagate back to us). | ||
| for brew_bin in /opt/homebrew/bin/brew /usr/local/bin/brew /home/linuxbrew/.linuxbrew/bin/brew; do | ||
| [[ -x "$brew_bin" ]] && { eval "$("$brew_bin" shellenv)"; break; } | ||
| done | ||
|
|
||
| step "Running make install setup" | ||
| cd "$DOTFILES" | ||
| make install setup |
Comment on lines
+6
to
7
| FC=${HOME}/.dotfiles | ||
| TMUX_SHARE=${HOME}/.local/share/tmux |
Comment on lines
+7
to
+9
| if command -v direnv >/dev/null 2>&1; then | ||
| eval "$(direnv hook zsh)" | ||
| fi |
Comment on lines
+130
to
+135
| [credential "https://github.com"] | ||
| helper = | ||
| helper = !/home/linuxbrew/.linuxbrew/bin/gh auth git-credential | ||
| [credential "https://gist.github.com"] | ||
| helper = | ||
| helper = !/home/linuxbrew/.linuxbrew/bin/gh auth git-credential |
Comment on lines
+43
to
+44
| newgrp docker | ||
| echo "User '$USER' added to the docker group." |
|
|
||
| # Codex skills selector popup | ||
| bind-key C-h display-popup -w 85% -h 85% -E "cd /Users/marcos/Workspaces/personal/ai-skills && /Users/marcos/Workspaces/personal/ai-skills/scripts/select-codex-skills.sh" | ||
| # vim: fdm=marker ft=bash |
| BELL_ICON="⚘" | ||
|
|
||
| # vim: ft=tmux | ||
| # vim: ft=bash |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.