mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-03-18 13:05:56 +00:00
Compare commits
27 Commits
26.3.7
...
feat/mise-
| Author | SHA1 | Date | |
|---|---|---|---|
| e918a41d75 | |||
| 9df2996a5d | |||
| 63977f81db | |||
| e0ac135352 | |||
| df84f1dc0e | |||
| d5e692e997 | |||
| fedb3c7cd1 | |||
| 026aa8afa7 | |||
| 8db8cbbe38 | |||
| bf61ccd8fb | |||
| 425543b40a | |||
| 2d316bfed7 | |||
| cccb64a703 | |||
| 052813695a | |||
| 51bb734998 | |||
| b530a6d8e9 | |||
| ed1fe05681 | |||
| f6cd1a4e6e | |||
| 85345121b2 | |||
| 1341aaf3b0 | |||
| 10aa7be8f8 | |||
|
|
035405b22f | ||
|
|
7dd6ccbc6c | ||
| 8a5c9f9089 | |||
|
|
2410f343c2 | ||
|
|
d120839830 | ||
|
|
5662d09202 |
14
.claude/agents/code-reviewer.md
Normal file
14
.claude/agents/code-reviewer.md
Normal file
@@ -0,0 +1,14 @@
|
||||
---
|
||||
name: code-reviewer
|
||||
description: Reviews shell/fish/lua changes for correctness and style
|
||||
tools: [Read, Grep, Glob, Bash]
|
||||
---
|
||||
|
||||
Review the changed files for:
|
||||
|
||||
1. **Shell scripts**: POSIX compliance for /bin/sh scripts, proper quoting, shellcheck issues
|
||||
2. **Fish files**: fish syntax correctness, consistent function patterns
|
||||
3. **Lua files**: stylua compliance, Neovim API usage patterns
|
||||
4. **All**: EditorConfig compliance (2-space indent, LF endings)
|
||||
|
||||
Report only high-confidence issues. Skip vendor files (fzf-tmux).
|
||||
@@ -22,6 +22,10 @@
|
||||
{
|
||||
"type": "command",
|
||||
"command": "fp=$(cat | jq -r '.tool_input.file_path // empty') && [ -n \"$fp\" ] && [ -f \"$fp\" ] && case \"$fp\" in *.fish) command -v fish_indent > /dev/null && fish_indent -w \"$fp\";; esac; exit 0"
|
||||
},
|
||||
{
|
||||
"type": "command",
|
||||
"command": "fp=$(cat | jq -r '.tool_input.file_path // empty') && [ -n \"$fp\" ] && [ -f \"$fp\" ] && case \"$fp\" in *.lua) command -v stylua > /dev/null && stylua \"$fp\";; esac; exit 0"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
38
.claude/skills/yaml-validate/SKILL.md
Normal file
38
.claude/skills/yaml-validate/SKILL.md
Normal file
@@ -0,0 +1,38 @@
|
||||
---
|
||||
name: yaml-validate
|
||||
description: >-
|
||||
Validate YAML files after editing.
|
||||
Apply when writing or modifying any .yml or .yaml file.
|
||||
user-invocable: false
|
||||
allowed-tools: Bash, Read
|
||||
---
|
||||
|
||||
After editing any YAML file, validate it:
|
||||
|
||||
## 1. Syntax check
|
||||
|
||||
Run yamllint on the file:
|
||||
|
||||
```bash
|
||||
yamllint <file>
|
||||
```
|
||||
|
||||
If yamllint is not available, fall back to:
|
||||
|
||||
```bash
|
||||
python3 -c "import yaml; yaml.safe_load(open('<file>'))"
|
||||
```
|
||||
|
||||
## 2. GitHub Actions workflows
|
||||
|
||||
If the file is under `.github/workflows/`, also run:
|
||||
|
||||
```bash
|
||||
actionlint <file>
|
||||
```
|
||||
|
||||
If actionlint is not available, skip silently.
|
||||
|
||||
## Files to skip
|
||||
|
||||
- `config/gh/hosts.yml` — managed by `gh` CLI, not hand-edited
|
||||
@@ -7,6 +7,7 @@
|
||||
"Exclude": [
|
||||
"base/plan",
|
||||
"config/fish/completions/.*",
|
||||
"config/karabiner/.*",
|
||||
"config/fish/conf.d/.*",
|
||||
"config/fish/functions/.*",
|
||||
"config/fzf/key-bindings.fish",
|
||||
|
||||
4
.github/workflows/linters.yml
vendored
4
.github/workflows/linters.yml
vendored
@@ -5,7 +5,7 @@ name: Lint Code Base
|
||||
# yamllint disable-line
|
||||
on:
|
||||
pull_request:
|
||||
branches: [master, main]
|
||||
branches: [main]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
@@ -36,4 +36,4 @@ jobs:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Run PR Lint
|
||||
uses: ivuorinen/actions/pr-lint@6e8f2aae9d0846d901d9eba15b8e94a2900573dc # v2026.03.02
|
||||
uses: ivuorinen/actions/pr-lint@1da3a0e79fcd7da6bed9ee1979f1449ba11f58f9 # v2026.03.14
|
||||
|
||||
2
.github/workflows/new-release.yml
vendored
2
.github/workflows/new-release.yml
vendored
@@ -42,7 +42,7 @@ jobs:
|
||||
|
||||
- name: Create release
|
||||
if: steps.daily-version.outputs.created
|
||||
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
|
||||
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ steps.daily-version.outputs.version }}
|
||||
|
||||
2
.github/workflows/sync-labels.yml
vendored
2
.github/workflows/sync-labels.yml
vendored
@@ -30,4 +30,4 @@ jobs:
|
||||
issues: write
|
||||
|
||||
steps:
|
||||
- uses: ivuorinen/actions/sync-labels@6e8f2aae9d0846d901d9eba15b8e94a2900573dc # v2026.03.02
|
||||
- uses: ivuorinen/actions/sync-labels@1da3a0e79fcd7da6bed9ee1979f1449ba11f58f9 # v2026.03.14
|
||||
|
||||
2
.github/workflows/update-submodules.yml
vendored
2
.github/workflows/update-submodules.yml
vendored
@@ -5,7 +5,7 @@ name: Update submodules
|
||||
on:
|
||||
schedule:
|
||||
# At 04:00 on Monday and Thursday.
|
||||
- cron: "0 4 * * 1"
|
||||
- cron: "0 4 * * 1,4"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -25,6 +25,8 @@ config/alacritty/theme-active.toml
|
||||
config/cheat/cheatsheets/pure-bash-bible/*
|
||||
config/cheat/cheatsheets/tldr/*
|
||||
config/fish/completions/asdf.fish
|
||||
config/fish/completions/kubectl.fish
|
||||
config/fish/completions/orbctl.fish
|
||||
config/fish/fish_variables
|
||||
config/fish/fish_variables.*
|
||||
config/gh/hosts.yml
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
1.25.5
|
||||
4
.mise.toml
Normal file
4
.mise.toml
Normal file
@@ -0,0 +1,4 @@
|
||||
[tools]
|
||||
node = "24.14.0"
|
||||
python = "3.14.3"
|
||||
go = "1.25.5"
|
||||
@@ -39,13 +39,13 @@ repos:
|
||||
hooks:
|
||||
- id: yamllint
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
rev: v4.0.0-alpha.8
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: prettier
|
||||
name: Prettier (YAML)
|
||||
entry: yarn prettier --write
|
||||
language: system
|
||||
types_or: [yaml]
|
||||
additional_dependencies:
|
||||
- prettier@3.8.1
|
||||
|
||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||
rev: v0.11.0.1
|
||||
@@ -64,7 +64,7 @@ repos:
|
||||
- id: actionlint
|
||||
|
||||
- repo: https://github.com/JohnnyMorganz/StyLua
|
||||
rev: v2.3.1
|
||||
rev: v2.4.0
|
||||
hooks:
|
||||
- id: stylua # or stylua-system / stylua-github
|
||||
exclude: hammerspoon\.types\.lua$
|
||||
@@ -76,7 +76,7 @@ repos:
|
||||
- id: fish_indent
|
||||
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.15.5
|
||||
rev: v0.15.6
|
||||
hooks:
|
||||
- id: ruff-check
|
||||
args: [--fix]
|
||||
|
||||
@@ -15,5 +15,4 @@ config/zsh
|
||||
local/bin/antigen.zsh
|
||||
local/bin/asdf
|
||||
tools
|
||||
docs/plans
|
||||
config/gh/hosts.yml
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
3.14.3
|
||||
@@ -50,12 +50,11 @@ the primary installation framework to manage symlinks and setup configurations.
|
||||
|
||||
- **Platform**: Darwin (macOS) - Version 24.6.0
|
||||
- **Architecture**: Universal (Intel/Apple Silicon via Homebrew)
|
||||
- **Dependencies**: Git, Homebrew, Yarn, various CLI tools managed via asdf/aqua
|
||||
- **Dependencies**: Git, Homebrew, Yarn, various CLI tools managed via mise
|
||||
|
||||
## Development Environment
|
||||
|
||||
- Node.js managed via nvm/asdf
|
||||
- Go version specified (.go-version)
|
||||
- Python version specified (.python-version)
|
||||
- Node.js, Go, Python, Ruby, Rust managed via mise
|
||||
- Version files (.nvmrc, .go-version, .python-version) consumed by mise via idiomatic_version_file
|
||||
- Package management via Yarn with lockfile
|
||||
- TypeScript support for configuration files
|
||||
|
||||
@@ -30,7 +30,7 @@ Configuration files for development tools and applications:
|
||||
- `starship.toml` - Starship prompt configuration
|
||||
- `shared.sh` - Cross-shell compatibility functions
|
||||
- `aerospace/`, `amethyst/`, `yabai/`, `skhd/` - Window managers
|
||||
- `direnv/`, `asdf/`, `aqua/` - Development environment tools
|
||||
- `direnv/`, `mise/`, `aqua/` - Development environment tools
|
||||
- `gpg-tui/`, `op/`, `gh/` - Security and CLI tools
|
||||
- Theme configurations: everforest color schemes across multiple tools
|
||||
|
||||
@@ -97,7 +97,7 @@ Installation and setup automation scripts
|
||||
- `.shellcheckrc` - ShellCheck configuration
|
||||
- `.mega-linter.yml` - MegaLinter configuration
|
||||
- `.luarc.json` - Lua language server configuration
|
||||
- `.nvmrc`, `.go-version`, `.python-version` - Version management
|
||||
- `.nvmrc`, `.go-version`, `.python-version` - Version files (consumed by mise)
|
||||
- Various ignore files (.gitignore, .prettierignore, .yamlignore, etc.)
|
||||
|
||||
## Testing Infrastructure
|
||||
|
||||
@@ -59,10 +59,11 @@ pre-commit run --all-files
|
||||
## Version Management
|
||||
|
||||
```bash
|
||||
# Check current versions
|
||||
node --version # Managed by nvm (.nvmrc: v20.18.1)
|
||||
go version # Managed by asdf (.go-version)
|
||||
python --version # Managed by asdf (.python-version)
|
||||
# Check current versions (all managed by mise)
|
||||
node --version # mise (.nvmrc via idiomatic_version_file)
|
||||
go version # mise (.go-version)
|
||||
python --version # mise (.python-version)
|
||||
mise ls # List all installed tool versions
|
||||
```
|
||||
|
||||
## System Utilities (Darwin-specific)
|
||||
|
||||
55
AGENTS.md
55
AGENTS.md
@@ -1,55 +0,0 @@
|
||||
# Project guidelines
|
||||
|
||||
This repository contains configuration files and helper scripts for managing
|
||||
a development environment.
|
||||
Dotbot drives installation, and host-specific folders under `hosts/` contain extra configs.
|
||||
|
||||
## Setup
|
||||
|
||||
1. Run `yarn install` to fetch linting tools and the Bats test framework.
|
||||
2. Re-run `yarn install` whenever `package.json` changes.
|
||||
3. Yarn is the package manager of choice; avoid `npm` commands.
|
||||
|
||||
## Keeping the repository up to date
|
||||
|
||||
1. Update submodules with `git submodule update --remote --merge`.
|
||||
2. Pull the latest changes and run `./install`.
|
||||
|
||||
## Linting and tests
|
||||
|
||||
- Format files with:
|
||||
|
||||
```bash
|
||||
yarn fix:prettier
|
||||
yarn fix:markdown
|
||||
```
|
||||
|
||||
- Shell scripts must pass `shellcheck`.
|
||||
|
||||
```bash
|
||||
find . -path ./node_modules -prune -o -name '*.sh' -print0 | xargs -0 shellcheck
|
||||
```
|
||||
|
||||
- Ensure `.editorconfig` rules pass:
|
||||
|
||||
```bash
|
||||
tools/install-ec.sh
|
||||
ec
|
||||
```
|
||||
|
||||
- Execute tests with `yarn test` when code changes.
|
||||
|
||||
## Debugging lint issues
|
||||
|
||||
- `yarn lint:prettier` and `yarn lint:markdown` show formatting errors.
|
||||
- Ensure shell scripts have a shebang or `# shellcheck shell=bash` directive.
|
||||
- Consult `.shellcheckrc` for project specific checks.
|
||||
|
||||
Scripts rely on helpers in `config/shared.sh` so they run under Bash, Zsh and Fish by default.
|
||||
|
||||
## Commits and PRs
|
||||
|
||||
- Use Semantic Commit messages: `type(scope): summary`.
|
||||
- Keep PR titles in the same format.
|
||||
|
||||
<!-- vim: set ft=markdown spell spelllang=en_us cc=80 : -->
|
||||
99
CLAUDE.md
99
CLAUDE.md
@@ -52,13 +52,13 @@ yarn test # Run all tests in tests/
|
||||
shellcheck <script> # Lint shell scripts
|
||||
|
||||
# Tooling maintenance
|
||||
yarn biome migrate --write # Update biome schema version
|
||||
npx @biomejs/biome migrate --write # Update biome schema version
|
||||
```
|
||||
|
||||
## Pre-commit Hooks
|
||||
|
||||
Configured in `.pre-commit-config.yaml`: shellcheck, shfmt, biome,
|
||||
yamllint, prettier, actionlint, stylua, fish_syntax/fish_indent.
|
||||
yamllint, prettier, actionlint, stylua, fish_syntax/fish_indent, ruff.
|
||||
Run `pre-commit run --all-files` to check everything.
|
||||
|
||||
## Commit Convention
|
||||
@@ -124,7 +124,7 @@ These are layered on top of the global config during installation.
|
||||
- **Lua** (neovim config): Formatted with stylua (`stylua.toml`),
|
||||
90-char line length.
|
||||
- **JSON/JS/TS/Markdown**: Formatted with Biome (`biome.json`),
|
||||
80-char width.
|
||||
80-char width (Markdown uses 120-char override).
|
||||
- **YAML**: Formatted with Prettier (`.prettierrc.json`),
|
||||
validated with yamllint (`.yamllint.yml`).
|
||||
|
||||
@@ -154,9 +154,102 @@ SC2174 (mkdir -p -m), SC2016 (single-quote expressions).
|
||||
- **Hooks** (`.claude/settings.json`):
|
||||
- *PreToolUse*: Blocks edits to `fzf-tmux`, `yarn.lock`, `.yarn/`
|
||||
- *PostToolUse*: Auto-runs `shfmt` on shell scripts after Edit/Write
|
||||
- *PostToolUse*: Auto-runs `fish_indent` on `.fish` files after Edit/Write
|
||||
- *PostToolUse*: Auto-runs `stylua` on `.lua` files after Edit/Write
|
||||
- **Skills** (`.claude/skills/`):
|
||||
- `shell-validate`: Auto-validates shell scripts (syntax + shellcheck)
|
||||
- `fish-validate`: Auto-validates fish scripts (syntax + fish_indent)
|
||||
- `lua-format`: Auto-formats Lua files with stylua
|
||||
- `yaml-validate`: Auto-validates YAML files (yamllint + actionlint)
|
||||
- **Subagents** (`.claude/agents/`):
|
||||
- `code-reviewer`: Reviews shell/fish/lua changes for correctness and style
|
||||
- **MCP Servers**:
|
||||
- `context7`: Live documentation lookup for tools and libraries
|
||||
|
||||
## Package Manager
|
||||
|
||||
Yarn (v4.12.0) is the package manager. Do not use npm.
|
||||
|
||||
# context-mode — MANDATORY routing rules
|
||||
|
||||
You have context-mode MCP tools available. These rules are NOT optional —
|
||||
they protect your context window from flooding.
|
||||
A single unrouted command can dump 56 KB into context and waste the entire session.
|
||||
|
||||
## BLOCKED commands — do NOT attempt these
|
||||
|
||||
### curl / wget — BLOCKED
|
||||
Any Bash command containing `curl` or `wget` is intercepted and replaced with an error message. Do NOT retry.
|
||||
Instead use:
|
||||
- `ctx_fetch_and_index(url, source)` to fetch and index web pages
|
||||
- `ctx_execute(language: "javascript", code: "const r = await fetch(...)")` to run HTTP calls in sandbox
|
||||
|
||||
### Inline HTTP — BLOCKED
|
||||
Any Bash command containing `fetch('http`, `requests.get(`, `requests.post(`,
|
||||
`http.get(`, or `http.request(` is intercepted and replaced with an error message.
|
||||
Do NOT retry with Bash.
|
||||
Instead use:
|
||||
- `ctx_execute(language, code)` to run HTTP calls in sandbox — only stdout enters context
|
||||
|
||||
### WebFetch — BLOCKED
|
||||
WebFetch calls are denied entirely. The URL is extracted and you are told to use `ctx_fetch_and_index` instead.
|
||||
Instead use:
|
||||
- `ctx_fetch_and_index(url, source)` then `ctx_search(queries)` to query the indexed content
|
||||
|
||||
## REDIRECTED tools — use sandbox equivalents
|
||||
|
||||
### Bash (>20 lines output)
|
||||
Bash is ONLY for: `git`, `mkdir`, `rm`, `mv`, `cd`, `ls`, `yarn install`, `pip install`,
|
||||
and other short-output commands.
|
||||
For everything else, use:
|
||||
- `ctx_batch_execute(commands, queries)` — run multiple commands + search in ONE call
|
||||
- `ctx_execute(language: "shell", code: "...")` — run in sandbox, only stdout enters context
|
||||
|
||||
### Read (for analysis)
|
||||
If you are reading a file to **Edit** it → Read is correct (Edit needs content in context).
|
||||
If you are reading to **analyze, explore, or summarize** →
|
||||
use `ctx_execute_file(path, language, code)` instead.
|
||||
Only your printed summary enters context. The raw file content stays in the sandbox.
|
||||
|
||||
### Grep (large results)
|
||||
Grep results can flood context.
|
||||
Use `ctx_execute(language: "shell", code: "grep ...")` to run searches in sandbox.
|
||||
Only your printed summary enters context.
|
||||
|
||||
## Tool selection hierarchy
|
||||
|
||||
1. **GATHER**: `ctx_batch_execute(commands, queries)` — Primary tool.
|
||||
Runs all commands, auto-indexes output, returns search results.
|
||||
ONE call replaces 30+ individual calls.
|
||||
2. **FOLLOW-UP**: `ctx_search(queries: ["q1", "q2", ...])` —
|
||||
Query indexed content. Pass ALL questions as array in ONE call.
|
||||
3. **PROCESSING**: `ctx_execute(language, code)` |
|
||||
`ctx_execute_file(path, language, code)` —
|
||||
Sandbox execution. Only stdout enters context.
|
||||
4. **WEB**: `ctx_fetch_and_index(url, source)` then
|
||||
`ctx_search(queries)` — Fetch, chunk, index, query.
|
||||
Raw HTML never enters context.
|
||||
5. **INDEX**: `ctx_index(content, source)` —
|
||||
Store content in FTS5 knowledge base for later search.
|
||||
|
||||
## Subagent routing
|
||||
|
||||
When spawning subagents (Agent/Task tool), the routing block is automatically
|
||||
injected into their prompt. Bash-type subagents are upgraded to general-purpose
|
||||
so they have access to MCP tools.
|
||||
You do NOT need to manually instruct subagents about context-mode.
|
||||
|
||||
## Output constraints
|
||||
|
||||
- Keep responses under 500 words.
|
||||
- Write artifacts (code, configs, PRDs) to FILES — never return them
|
||||
as inline text. Return only: file path + 1-line description.
|
||||
- When indexing content, use descriptive source labels so others can `ctx_search(source: "label")` later.
|
||||
|
||||
## ctx commands
|
||||
|
||||
| Command | Action |
|
||||
|---------------|---------------------------------------------------------------------------------------|
|
||||
| `ctx stats` | Call the `ctx_stats` MCP tool and display the full output verbatim |
|
||||
| `ctx doctor` | Call the `ctx_doctor` MCP tool, run the returned shell command, display as checklist |
|
||||
| `ctx upgrade` | Call the `ctx_upgrade` MCP tool, run the returned shell command, display as checklist |
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
|
||||
"$schema": "https://biomejs.dev/schemas/2.4.7/schema.json",
|
||||
"vcs": {
|
||||
"enabled": true,
|
||||
"clientKind": "git",
|
||||
@@ -20,6 +20,7 @@
|
||||
"!!**/config/op/plugins/used_plugins",
|
||||
"!!**/config/tmux/plugins",
|
||||
"!!**/config/zsh",
|
||||
"!!**/config/karabiner",
|
||||
"!!**/config/vim",
|
||||
"!!**/lazy-lock.json",
|
||||
"!!**/local/bin/antigen.zsh",
|
||||
|
||||
@@ -33,6 +33,8 @@ alias .c='cd $HOME/Code'
|
||||
alias .d='cd $DOTFILES'
|
||||
alias .l='cd $HOME/.local'
|
||||
alias .o='cd $HOME/Code/ivuorinen/obsidian/'
|
||||
alias .s='cd $HOME/Code/s'
|
||||
alias .p='cd $HOME/Code/ivuorinen'
|
||||
|
||||
# Shortcuts for listing
|
||||
alias ll="ls -la"
|
||||
|
||||
100
config/exports
100
config/exports
@@ -14,7 +14,20 @@
|
||||
# if DOTFILES is not set, set it to the default location
|
||||
[ -z "${DOTFILES:-}" ] && export DOTFILES="$HOME/.dotfiles"
|
||||
|
||||
export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
|
||||
# Editor settings
|
||||
[ -z "${EDITOR:-}" ] && export EDITOR="nvim"
|
||||
[ -z "${VISUAL:-}" ] && export VISUAL="code"
|
||||
|
||||
# Bootstrap: ensure local/bin is on PATH so x-path is available
|
||||
PATH="$DOTFILES/local/bin:$PATH"
|
||||
# Use x-path to deduplicate PATH entries (only if x-path is available)
|
||||
if command -v x-path &> /dev/null; then
|
||||
# shellcheck source=../local/bin/x-path
|
||||
source "$(command -v x-path)"
|
||||
normalize_path_var
|
||||
do_prepend "$XDG_BIN_HOME" "$DOTFILES/local/bin" "/opt/homebrew/bin" "/usr/local/bin"
|
||||
fi
|
||||
export PATH
|
||||
|
||||
if ! command -v msg &> /dev/null; then
|
||||
# Function to print messages if VERBOSE is enabled
|
||||
@@ -304,7 +317,7 @@ export ANTIDOTE_PLUGINS="$XDG_CONFIG_HOME/zsh/antidote_plugins"
|
||||
# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
|
||||
msg "Setting up Ansible configuration"
|
||||
export ANSIBLE_HOME="$XDG_CONFIG_HOME/ansible"
|
||||
export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible.cfg"
|
||||
export ANSIBLE_CONFIG="$ANSIBLE_HOME/ansible.cfg"
|
||||
export ANSIBLE_GALAXY_CACHE_DIR="$XDG_CACHE_HOME/ansible/galaxy_cache"
|
||||
x-dc "$ANSIBLE_HOME"
|
||||
x-dc "$ANSIBLE_GALAXY_CACHE_DIR"
|
||||
@@ -325,10 +338,25 @@ export AWS_CONFIGURE_OUTPUT=true
|
||||
export AWS_CONFIGURE_PROFILE=true
|
||||
export AWS_CONFIGURE_PROMPT=true
|
||||
export AWS_CONFIGURE_PROMPT_DEFAULT="default"
|
||||
export AWS_SESSION_TOKEN_FILE="${XDG_STATE_HOME}/aws/session_token"
|
||||
export AWS_CONFIGURE_SESSION=true
|
||||
export AWS_CONFIGURE_SESSION_DURATION=7200
|
||||
export AWS_CONFIGURE_SESSION_MFA=true
|
||||
|
||||
# bob manages nvim versions
|
||||
msg "Setting up bob configuration"
|
||||
x-path-prepend "$XDG_DATA_HOME/bob/nvim-bin"
|
||||
# Mason (nvim package manager)
|
||||
msg "Setting up Mason configuration"
|
||||
export MASON_HOME="$XDG_DATA_HOME/nvim/mason"
|
||||
|
||||
# Neovim environment variables
|
||||
msg "Setting up Neovim configuration"
|
||||
[ -z "${NVIM_STATE:-}" ] && export NVIM_STATE="$XDG_STATE_HOME/nvim"
|
||||
[ -z "${NVIM_CONFIG_HOME:-}" ] && export NVIM_CONFIG_HOME="$XDG_CONFIG_HOME/nvim"
|
||||
[ -z "${NVIM_DATA_HOME:-}" ] && export NVIM_DATA_HOME="$XDG_DATA_HOME/nvim"
|
||||
[ -z "${NVIM_CACHE_HOME:-}" ] && export NVIM_CACHE_HOME="$XDG_CACHE_HOME/nvim"
|
||||
[ -z "${NVIM_LOG_PATH:-}" ] && export NVIM_LOG_PATH="$NVIM_STATE/log"
|
||||
[ -z "${NVIM_SESSION_PATH:-}" ] && export NVIM_SESSION_PATH="$NVIM_STATE/session"
|
||||
[ -z "${NVIM_SHADA_PATH:-}" ] && export NVIM_SHADA_PATH="$NVIM_STATE/shada"
|
||||
[ -z "${NVIM_UNDO_PATH:-}" ] && export NVIM_UNDO_PATH="$NVIM_STATE/undo"
|
||||
|
||||
# bkt (shell command caching tool) configuration
|
||||
msg "Setting up bkt configuration"
|
||||
@@ -350,12 +378,21 @@ export COMPOSER_HOME="$XDG_STATE_HOME/composer"
|
||||
export COMPOSER_BIN="$COMPOSER_HOME/vendor/bin"
|
||||
export PATH="$COMPOSER_BIN:$PATH"
|
||||
|
||||
# Yarn
|
||||
msg "Setting up Yarn configuration"
|
||||
export YARN_GLOBAL_FOLDER="$XDG_DATA_HOME/yarn"
|
||||
|
||||
# docker, https://docs.docker.com/engine/reference/commandline/cli/
|
||||
msg "Setting up Docker configuration"
|
||||
export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
|
||||
x-dc "$DOCKER_CONFIG"
|
||||
# Docker: Disable snyk ad
|
||||
export DOCKER_SCAN_SUGGEST=false
|
||||
export DOCKER_HIDE_LEGACY_COMMANDS=true
|
||||
|
||||
# direnv
|
||||
msg "Setting up direnv configuration"
|
||||
export DIRENV_LOG_FORMAT=""
|
||||
|
||||
# fzf
|
||||
export FZF_BASE="${XDG_CONFIG_HOME}/fzf"
|
||||
@@ -375,13 +412,6 @@ export GOBIN="$XDG_BIN_HOME"
|
||||
# Lando
|
||||
export PATH="$HOME/.lando/bin${PATH+:$PATH}" #landopath
|
||||
|
||||
# NPM: Add npm packages to path
|
||||
msg "Setting up NPM configuration"
|
||||
x-have node && {
|
||||
NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
|
||||
export PATH="$NVM_NODE_BIN_DIR:$PATH"
|
||||
}
|
||||
|
||||
# oh-my-posh (omp) configuration
|
||||
msg "Setting up oh-my-posh configuration"
|
||||
export OHMYPOSH_CFG="$DOTFILES/config/omp/own.toml"
|
||||
@@ -391,20 +421,21 @@ msg "Setting up 1Password CLI configuration"
|
||||
export OP_CACHE="$XDG_STATE_HOME/1password"
|
||||
|
||||
# Python
|
||||
#
|
||||
# pyenv, python environments
|
||||
msg "Setting up Python configuration"
|
||||
export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
|
||||
export PYENV_ROOT="$XDG_STATE_HOME/pyenv"
|
||||
## for MichaelAquilina/zsh-autoswitch-virtualenv
|
||||
export AUTOSWITCH_VIRTUAL_ENV_DIR="$WORKON_HOME"
|
||||
export PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:$PATH"
|
||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
x-have pyenv && eval "$(pyenv init -)"
|
||||
|
||||
# Rust / cargo
|
||||
msg "Setting up Rust/Cargo configuration"
|
||||
export RUST_WITHOUT=rust-docs
|
||||
export CARGO_HOME="$XDG_DATA_HOME/cargo"
|
||||
export CARGO_BIN_HOME="$XDG_BIN_HOME"
|
||||
export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
|
||||
export RUST_WITHOUT="clippy,docs,rls"
|
||||
|
||||
# Poetry
|
||||
msg "Setting up Poetry configuration"
|
||||
export POETRY_HOME="$XDG_DATA_HOME/poetry"
|
||||
|
||||
# sonarlint
|
||||
# https://www.sonarlint.org/
|
||||
@@ -433,6 +464,10 @@ export ZSH_TMUX_UNICODE=true
|
||||
export ZSH_TMUX_AUTOQUIT=false
|
||||
export ZSH_TMUX_DEFAULT_SESSION_NAME=main
|
||||
|
||||
# tms (tmux session manager)
|
||||
msg "Setting up tms configuration"
|
||||
export TMS_CONFIG_FILE="$XDG_CONFIG_HOME/tms/config.toml"
|
||||
|
||||
# wakatime, https://github.com/wakatime/wakatime-cli
|
||||
msg "Setting up Wakatime configuration"
|
||||
export WAKATIME_HOME="$XDG_STATE_HOME/wakatime"
|
||||
@@ -442,12 +477,39 @@ x-dc "$WAKATIME_HOME"
|
||||
msg "Setting up LM Studio configuration"
|
||||
export PATH="$PATH:$HOME/.lmstudio/bin"
|
||||
|
||||
# Screen
|
||||
msg "Setting up screen configuration"
|
||||
export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
|
||||
|
||||
# Zoxide
|
||||
msg "Setting up Zoxide configuration"
|
||||
export _ZO_DATA_DIR="$XDG_DATA_HOME/zoxide"
|
||||
export _ZO_EXCLUDE_DIRS="$XDG_DATA_HOME"
|
||||
|
||||
# Misc
|
||||
msg "Setting up miscellaneous configuration"
|
||||
export ZSHZ_DATA="$XDG_STATE_HOME/z"
|
||||
export CHEAT_USE_FZF=true
|
||||
export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
|
||||
|
||||
# Additional PATH entries (aligned with fish config)
|
||||
[ -d "$XDG_DATA_HOME/mise/shims" ] && export PATH="$XDG_DATA_HOME/mise/shims:$PATH"
|
||||
[ -d "$YARN_GLOBAL_FOLDER/bin" ] && export PATH="$PATH:$YARN_GLOBAL_FOLDER/bin"
|
||||
[ -d "$MASON_HOME/bin" ] && export PATH="$PATH:$MASON_HOME/bin"
|
||||
[ -d "$HOME/.dotnet/tools" ] && export PATH="$PATH:$HOME/.dotnet/tools"
|
||||
[ -d "$POETRY_HOME/bin" ] && export PATH="$PATH:$POETRY_HOME/bin"
|
||||
[ -d "$HOME/.opencode/bin" ] && export PATH="$PATH:$HOME/.opencode/bin"
|
||||
|
||||
# mise — unified tool version manager
|
||||
# https://mise.jdx.dev
|
||||
if command -v mise &> /dev/null; then
|
||||
if [ -n "${ZSH_NAME:-}" ]; then
|
||||
eval "$(mise activate zsh)"
|
||||
else
|
||||
eval "$(mise activate bash)"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f "$XDG_CONFIG_HOME/exports-secret" ]; then source "$XDG_CONFIG_HOME/exports-secret"; fi
|
||||
if [ -f "$XDG_CONFIG_HOME/exports-local" ]; then source "$XDG_CONFIG_HOME/exports-local"; fi
|
||||
# shellcheck source=./exports-lakka
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Set aliases for fish shell
|
||||
|
||||
alias vim='vim -u "$XDG_CONFIG_HOME/vim/vimrc"'
|
||||
alias vim='nvim'
|
||||
alias vi='nvim'
|
||||
|
||||
# eza aliases if eza is installed
|
||||
if type -q eza >/dev/null
|
||||
@@ -92,5 +93,41 @@ function configure_tide \
|
||||
--transient=Yes
|
||||
end
|
||||
|
||||
# Navigation aliases
|
||||
abbr --add .. 'cd ..'
|
||||
abbr --add ... 'cd ../..'
|
||||
abbr --add .... 'cd ../../..'
|
||||
|
||||
# Interesting folders
|
||||
function .b --wraps='cd $XDG_BIN_HOME' --description 'cd $XDG_BIN_HOME'
|
||||
cd $XDG_BIN_HOME $argv
|
||||
end
|
||||
|
||||
function .l --wraps='cd ~/.local' --description 'cd ~/.local'
|
||||
cd ~/.local $argv
|
||||
end
|
||||
|
||||
function .o --wraps='cd ~/Code/ivuorinen/obsidian/' --description 'cd ~/Code/ivuorinen/obsidian/'
|
||||
cd ~/Code/ivuorinen/obsidian/ $argv
|
||||
end
|
||||
|
||||
# cd to git root directory
|
||||
function cdgr --description 'cd to git root'
|
||||
if git rev-parse --is-inside-work-tree &>/dev/null
|
||||
cd (git rev-parse --show-toplevel); or return $status
|
||||
else
|
||||
echo >&2 "Not in a git repository"
|
||||
return 1
|
||||
end
|
||||
end
|
||||
|
||||
# Colored grep
|
||||
abbr --add grep 'grep --color'
|
||||
|
||||
# Date helpers
|
||||
alias isodate="date +'%Y-%m-%d'"
|
||||
alias x-datetime="date +'%Y-%m-%d %H:%M:%S'"
|
||||
alias x-timestamp="date +'%s'"
|
||||
|
||||
# Random abbreviations
|
||||
abbr --add stats onefetch --nerd-fonts --true-color never
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
function ___paths_plugin_set_colors
|
||||
if not set -q ___paths_plugin_colors
|
||||
set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
function _paths_uninstall --on-event paths_uninstall
|
||||
for i in ___paths_plugin_wrap_color ___paths_plugin_output ___paths_plugin_handle_found_item ___paths_plugin_handle_source ___paths_plugin_cycle_color
|
||||
functions -e $i
|
||||
end
|
||||
set -e ___paths_plugin_colors
|
||||
set -e ___paths_plugin_current_color
|
||||
end
|
||||
|
||||
function _paths_install --on-event _paths_install
|
||||
___paths_plugin_set_colors
|
||||
end
|
||||
|
||||
function _paths_update --on-event paths_update
|
||||
___paths_plugin_set_colors
|
||||
end
|
||||
@@ -1 +0,0 @@
|
||||
source "/home/ivuorinen/.local/share/cargo/env.fish"
|
||||
@@ -2,6 +2,8 @@
|
||||
# │ fish/config.fish │
|
||||
# ╰──────────────────────────────────────────────────────────╯
|
||||
|
||||
set -g fish_greeting
|
||||
|
||||
fish_config theme choose "Catppuccin Mocha"
|
||||
|
||||
test -e "$HOME/.config/fish/alias.fish" &&
|
||||
@@ -20,20 +22,17 @@ if status is-interactive
|
||||
type -q op; and test -e "$HOME/.config/op/plugins.sh" &&
|
||||
source "$HOME/.config/op/plugins.sh"
|
||||
|
||||
# version manager initializers
|
||||
type -q mise; and source (mise activate fish|psub)
|
||||
type -q rbenv; and source (rbenv init -|psub)
|
||||
type -q pyenv; and source (pyenv init -|psub)
|
||||
type -q pyenv; and source (pyenv virtualenv-init -|psub)
|
||||
type -q goenv; and source (goenv init -|psub)
|
||||
# type -q fnm; and fnm env --use-on-cd --shell fish | source
|
||||
type -q load_nvm; and load_nvm >/dev/stderr
|
||||
# mise version manager
|
||||
type -q mise; and mise activate fish | source
|
||||
|
||||
# Initialize other tools if available
|
||||
type -q zoxide; and zoxide init fish | source
|
||||
|
||||
# Start tmux if not already running and not in SSH
|
||||
#open-tmux # defined in functions/open-tmux.fish
|
||||
#.t # defined in functions/.t.fish
|
||||
else
|
||||
# Non-interactive shells (IDE subprocesses) use shims for tool discovery
|
||||
type -q mise; and mise activate fish --shims | source
|
||||
end
|
||||
|
||||
# Added by LM Studio CLI (lms)
|
||||
@@ -48,3 +47,8 @@ fish_add_path $HOME/.opencode/bin
|
||||
# Added by OrbStack: command-line tools and integration
|
||||
# This won't be added again if you remove it.
|
||||
source ~/.orbstack/shell/init2.fish 2>/dev/null || :
|
||||
|
||||
# Warn if GITHUB_TOKEN is not set
|
||||
if status is-interactive; and not set -q GITHUB_TOKEN
|
||||
echo "Warning: GITHUB_TOKEN is not set" >&2
|
||||
end
|
||||
|
||||
@@ -21,12 +21,7 @@ fish_add_path "$XDG_BIN_HOME"
|
||||
fish_add_path "$XDG_DATA_HOME/mise/shims"
|
||||
|
||||
# Add cargo bin to path
|
||||
fish_add_path "$XDG_SHARE_HOME/cargo/bin"
|
||||
|
||||
# NPM/NVM configuration
|
||||
set -q NVM_DIR; or set -x NVM_DIR "$XDG_DATA_HOME/nvm"
|
||||
fish_add_path "$NVM_DIR/bin"
|
||||
fish_add_path "$XDG_CONFIG_HOME/nvm"
|
||||
fish_add_path "$XDG_DATA_HOME/cargo/bin"
|
||||
|
||||
# Yarn configuration
|
||||
set -q YARN_GLOBAL_FOLDER; or set -x YARN_GLOBAL_FOLDER "$XDG_DATA_HOME/yarn"
|
||||
@@ -36,6 +31,9 @@ fish_add_path "$YARN_GLOBAL_FOLDER/bin"
|
||||
set -q MASON_HOME; or set -x MASON_HOME "$XDG_DATA_HOME/nvim/mason"
|
||||
fish_add_path "$MASON_HOME/bin"
|
||||
|
||||
# Add dotnet tools to path
|
||||
fish_add_path "$HOME/.dotnet/tools/"
|
||||
|
||||
# Set Neovim environment variables
|
||||
test -z "$NVIM_STATE" && set -x NVIM_STATE "$XDG_STATE_HOME/nvim"
|
||||
test -z "$NVIM_CONFIG_HOME" && set -x NVIM_CONFIG_HOME "$XDG_CONFIG_HOME/nvim"
|
||||
@@ -58,11 +56,14 @@ set -q AWS_CONFIG_FILE; or set -x AWS_CONFIG_FILE "$XDG_STATE_HOME/aws/config"
|
||||
set -q AWS_SHARED_CREDENTIALS_FILE; or set -x AWS_SHARED_CREDENTIALS_FILE "$XDG_STATE_HOME/aws/credentials"
|
||||
set -q AWS_SESSION_TOKEN; or set -x AWS_SESSION_TOKEN "$XDG_STATE_HOME/aws/session_token"
|
||||
set -q AWS_DATA_PATH; or set -x AWS_DATA_PATH "$XDG_DATA_HOME/aws"
|
||||
set -q AWS_DEFAULT_REGION; or set -x AWS_DEFAULT_REGION eu-west-1
|
||||
set -q AWS_DEFAULT_OUTPUT; or set -x AWS_DEFAULT_OUTPUT table
|
||||
set -q AWS_CONFIGURE_KEYS; or set -x AWS_CONFIGURE_KEYS true
|
||||
set -q AWS_CONFIGURE_SESSION; or set -x AWS_CONFIGURE_SESSION true
|
||||
set -q AWS_CONFIGURE_SESSION_DURATION; or set -x AWS_CONFIGURE_SESSION_DURATION 7200
|
||||
set -q AWS_CONFIGURE_SESSION_MFA; or set -x AWS_CONFIGURE_SESSION_MFA true
|
||||
set -q AWS_CONFIGURE_REGION; or set -x AWS_CONFIGURE_REGION true
|
||||
set -q AWS_CONFIGURE_OUTPUT; or set -x AWS_CONFIGURE_OUTPUT true
|
||||
set -q AWS_CONFIGURE_PROFILE; or set -x AWS_CONFIGURE_PROFILE true
|
||||
set -q AWS_CONFIGURE_PROMPT; or set -x AWS_CONFIGURE_PROMPT true
|
||||
set -q AWS_CONFIGURE_PROMPT_DEFAULT; or set -x AWS_CONFIGURE_PROMPT_DEFAULT true
|
||||
@@ -87,14 +88,6 @@ x-dc "$DOCKER_CONFIG"
|
||||
set -q DOCKER_HIDE_LEGACY_COMMANDS; or set -x DOCKER_HIDE_LEGACY_COMMANDS true
|
||||
set -q DOCKER_SCAN_SUGGEST; or set -x DOCKER_SCAN_SUGGEST false
|
||||
|
||||
# FNM / Node.js configuration
|
||||
set -q FNM_DIR; or set -x FNM_DIR "$XDG_DATA_HOME/fnm"
|
||||
fish_add_path "$FNM_DIR"
|
||||
set -q FNM_VERSION_FILE_STRATEGY; or set -x FNM_VERSION_FILE_STRATEGY recursive
|
||||
set -q FNM_USE_ON_CD; or set -x FNM_USE_ON_CD true
|
||||
set -q FNM_COREPACK_ENABLED; or set -x FNM_COREPACK_ENABLED true
|
||||
set -q FNM_RESOLVE_ENGINES; or set -x FNM_RESOLVE_ENGINES true
|
||||
|
||||
# fzf configuration
|
||||
set -q FZF_BASE; or set -x FZF_BASE "$XDG_CONFIG_HOME/fzf"
|
||||
set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS \
|
||||
@@ -104,19 +97,14 @@ set -q FZF_DEFAULT_OPTS; or set -x FZF_DEFAULT_OPTS \
|
||||
set -q GNUPGHOME; or set -x GNUPGHOME "$XDG_DATA_HOME/gnupg"
|
||||
|
||||
# Go configuration
|
||||
# set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go"
|
||||
set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go"
|
||||
set -q GOBIN; or set -x GOBIN "$XDG_BIN_HOME"
|
||||
|
||||
set -q GOENV_ROOT; or set -x GOENV_ROOT "$XDG_DATA_HOME/goenv"
|
||||
set -q GOENV_RC_FILE; or set -x GOENV_RC_FILE "$XDG_CONFIG_HOME/goenv/goenvrc.fish"
|
||||
|
||||
# 1Password configuration
|
||||
set -q OP_CACHE; or set -x OP_CACHE "$XDG_STATE_HOME/1password"
|
||||
|
||||
# Python configuration
|
||||
set -q WORKON_HOME; or set -x WORKON_HOME "$XDG_DATA_HOME/virtualenvs"
|
||||
set -q PYENV_ROOT; or set -x PYENV_ROOT "$XDG_DATA_HOME/pyenv"
|
||||
fish_add_path "$PYENV_ROOT/bin"
|
||||
|
||||
# Poetry configuration
|
||||
set -q POETRY_HOME; or set -x POETRY_HOME "$XDG_DATA_HOME/poetry"
|
||||
@@ -128,7 +116,6 @@ set -q CARGO_BIN_HOME; or set -x CARGO_BIN_HOME "$XDG_BIN_HOME"
|
||||
set -q RUSTUP_HOME; or set -x RUSTUP_HOME "$XDG_DATA_HOME/rustup"
|
||||
set -x RUST_WITHOUT "clippy,docs,rls"
|
||||
fish_add_path "$CARGO_HOME/bin"
|
||||
fish_add_path "$XDG_SHARE_HOME/bob/nvim-bin"
|
||||
|
||||
# screen configuration
|
||||
set -q SCREENRC; or set -x SCREENRC "$XDG_CONFIG_HOME/misc/screenrc"
|
||||
@@ -166,6 +153,15 @@ x-dc "$WAKATIME_HOME"
|
||||
set -q _ZO_DATA_DIR; or set -x _ZO_DATA_DIR "$XDG_DATA_HOME/zoxide"
|
||||
set -q _ZO_EXCLUDE_DIRS; or set -x _ZO_EXCLUDE_DIRS "$XDG_DATA_HOME"
|
||||
|
||||
# bkt (shell command caching tool) configuration
|
||||
set -q BKT_TTL; or set -x BKT_TTL 1m
|
||||
|
||||
# Manpager
|
||||
set -q MANPAGER; or set -x MANPAGER "less -X"
|
||||
|
||||
# Lando
|
||||
fish_add_path "$HOME/.lando/bin"
|
||||
|
||||
# Miscellaneous configuration
|
||||
set -q CHEAT_USE_FZF; or set -x CHEAT_USE_FZF true
|
||||
set -q SQLITE_HISTORY; or set -x SQLITE_HISTORY "$XDG_CACHE_HOME/sqlite/sqlite_history"
|
||||
|
||||
@@ -3,3 +3,4 @@ jethrokuan/z
|
||||
ivuorinen/phpenv.fish
|
||||
ilancosman/tide@v6
|
||||
catppuccin/fish
|
||||
edc/bass
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Description: Open tmux session if not already open
|
||||
# Dependencies: tmux
|
||||
# Usage: open-tmux
|
||||
function open-tmux --wraps='tmux attach-session -t main || tmux new-session -s main' --description 'open tmux session'
|
||||
# Usage: .t
|
||||
function .t --wraps='tmux attach-session -t main || tmux new-session -s main' --description 'open tmux session'
|
||||
# Check if not in an SSH session and not already in a tmux session
|
||||
if test -z "$SSH_TTY"; and not set -q TMUX
|
||||
command tmux attach-session -t main || command tmux new-session -s main
|
||||
@@ -1,16 +0,0 @@
|
||||
function load_nvm --on-variable="PWD"
|
||||
set -l default_node_version (nvm version default)
|
||||
set -l node_version (nvm version)
|
||||
set -l nvmrc_path (nvm_find_nvmrc)
|
||||
if test -n "$nvmrc_path"
|
||||
set -l nvmrc_node_version (nvm version (cat $nvmrc_path))
|
||||
if test "$nvmrc_node_version" = N/A
|
||||
nvm install (cat $nvmrc_path)
|
||||
else if test "$nvmrc_node_version" != "$node_version"
|
||||
nvm use $nvmrc_node_version
|
||||
end
|
||||
else if test "$node_version" != "$default_node_version"
|
||||
echo "Reverting to default Node version"
|
||||
nvm use default
|
||||
end
|
||||
end
|
||||
@@ -1,3 +0,0 @@
|
||||
function nvm
|
||||
bass source $NVM_DIR/nvm.sh --no-use ';' nvm $argv
|
||||
end
|
||||
@@ -1,3 +0,0 @@
|
||||
function nvm_find_nvmrc
|
||||
bass source $NVM_DIR/nvm.sh --no-use ';' nvm_find_nvmrc
|
||||
end
|
||||
@@ -1,175 +0,0 @@
|
||||
function ___paths_plugin_wrap_color
|
||||
set_color normal
|
||||
set_color "$argv[1]"
|
||||
echo -n (set_color "$argv[1]")"$argv[2..]"
|
||||
set_color normal
|
||||
end
|
||||
|
||||
# duplicated in conf.d
|
||||
function ___paths_plugin_set_colors
|
||||
if not set -q ___paths_plugin_colors
|
||||
set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
function ___paths_plugin_cycle_color
|
||||
if not set -q ___paths_plugin_current_color
|
||||
set -Ux ___paths_plugin_current_color 1
|
||||
else if test $___paths_plugin_current_color -gt (count $___paths_plugin_colors)
|
||||
set -Ux ___paths_plugin_current_color 1
|
||||
end
|
||||
echo $___paths_plugin_colors[$___paths_plugin_current_color]
|
||||
set -Ux ___paths_plugin_current_color (math $___paths_plugin_current_color + 1)
|
||||
end
|
||||
|
||||
function ___paths_plugin_handle_found_item -a testName outFlags
|
||||
set -f flags (string split -n ' ' -- "$outFlags")
|
||||
set -f options (fish_opt -s c -l clean)
|
||||
set -a options (fish_opt -s s -l single)
|
||||
set -a options (fish_opt -s k -l no-color)
|
||||
set -a options (fish_opt -s n -l inline)
|
||||
argparse $options -- $flags
|
||||
|
||||
set -f arrow "=>"
|
||||
# check if file exists
|
||||
if test -e "$testName"
|
||||
set -f nameOut (string trim -- "$testName")
|
||||
if not set -q _flag_c # is not clean
|
||||
if test -L "$testName" # is symlink
|
||||
set -f __linkname (readlink -f "$testName")
|
||||
set __linkname (string trim -- "$__linkname")
|
||||
set testName (string trim -- "$testName")
|
||||
if not set -q _flag_k # is color
|
||||
set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $testName) (___paths_plugin_wrap_color "yellow" "$arrow") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $__linkname)
|
||||
else # is color
|
||||
set nameOut (echo -n "$testName" "$arrow" "$__linkname")
|
||||
end
|
||||
else # is not symlink
|
||||
if not set -q _flag_k # is color
|
||||
set testName (string trim -- "$testName")
|
||||
set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$testName")
|
||||
else
|
||||
set testName (string trim -- "$testName")
|
||||
set nameOut "$testName"
|
||||
end
|
||||
end
|
||||
|
||||
set nameOut (string trim -- "$nameOut")
|
||||
# do the tick
|
||||
if set -q _flag_k # is not color
|
||||
set nameOut "- $nameOut"
|
||||
else # is color
|
||||
set nameOut (___paths_plugin_wrap_color "yellow" "-") "$nameOut"
|
||||
end
|
||||
end
|
||||
set nameOut (string trim -- "$nameOut")
|
||||
echo -n $nameOut
|
||||
end
|
||||
end
|
||||
|
||||
function paths --description "Reveal the executable matches in shell paths or fish autoload."
|
||||
set -f options (fish_opt -s c -l clean)
|
||||
set -a options (fish_opt -s s -l single)
|
||||
set -a options (fish_opt -s k -l no-color)
|
||||
set -a options (fish_opt -s q -l quiet)
|
||||
set -a options (fish_opt -s n -l inline)
|
||||
argparse $options -- $argv
|
||||
|
||||
if test (count $argv) -lt 1
|
||||
echo "paths - executable matches in shell paths or fish autoload."
|
||||
and echo "usage: paths [-c|-s|-k] <name>"
|
||||
and echo -e "\t-c or --no-color: output without color"
|
||||
and echo -e "\t-s or --single: output without color or headers, the first result"
|
||||
and echo -e "\t-k or --clean: output without tick marks or headers"
|
||||
# and echo -e "\t-n or --inline: output without endline"
|
||||
and return 1
|
||||
end
|
||||
|
||||
set -f foundStatus 1
|
||||
set -f input (string trim -- $argv)
|
||||
# deprecated
|
||||
if set -q _flag_q
|
||||
set _flag_c True
|
||||
end
|
||||
|
||||
if set -q _flag_s
|
||||
set _flag_k True
|
||||
set _flag_c True
|
||||
end
|
||||
|
||||
set -f outFlags ''
|
||||
set -q _flag_n; and set -a outFlags -n
|
||||
set -q _flag_c; and set -a outFlags -c
|
||||
set -q _flag_k; and set -a outFlags -k
|
||||
set -q _flag_s; and set -a outFlags -s
|
||||
set outFlags (string split -n " " -- "$outFlags")
|
||||
___paths_plugin_set_colors
|
||||
# loop over list of path lists
|
||||
for pVar in VIRTUAL_ENV fisher_path fish_function_path fish_user_paths PATH
|
||||
set -e acc
|
||||
set -f acc ''
|
||||
set -e hit
|
||||
# see if variable is empty
|
||||
if test -z "$pVar"
|
||||
continue
|
||||
end
|
||||
set -f acc (begin
|
||||
for t in $$pVar
|
||||
for snit in "$t/$input.fish" "$t/$input"
|
||||
set -f found (___paths_plugin_handle_found_item "$snit" "$outFlags")
|
||||
set found (string trim -- "$found")
|
||||
if test -n "$found"
|
||||
set -f hit True
|
||||
echo "$found"
|
||||
if set -q _flag_s
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if set -q _flag_s
|
||||
if set -q hit
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
# prepend source
|
||||
if not set -q _flag_c
|
||||
if set -q hit
|
||||
set pVar (string trim -- "$pVar")
|
||||
echo -e -n "$pVar\n"
|
||||
end
|
||||
end
|
||||
|
||||
if test -n "$acc"
|
||||
set foundStatus 0
|
||||
for fk in $acc
|
||||
echo $fk
|
||||
if set -q _flag_s
|
||||
# stop after one
|
||||
return $foundStatus
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# check
|
||||
set -l built (type --type $input 12&>/dev/null)
|
||||
if test -n "$built"
|
||||
and test "$built" = builtin
|
||||
set $foundStatus 0
|
||||
if not set -q _flag_c
|
||||
echo -e -n "builtin\n"
|
||||
if set -q _flag_k
|
||||
echo - "$input"
|
||||
else # is color
|
||||
echo (___paths_plugin_wrap_color "yellow" "-") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$input")
|
||||
end
|
||||
else
|
||||
echo "$input"
|
||||
end
|
||||
end
|
||||
return $foundStatus
|
||||
end
|
||||
@@ -58,3 +58,32 @@ fish_pager_color_progress 737994
|
||||
fish_pager_color_prefix f4b8e4
|
||||
fish_pager_color_completion c6d0f5
|
||||
fish_pager_color_description 737994
|
||||
|
||||
[unknown]
|
||||
# preferred_background: 303446
|
||||
fish_color_normal c6d0f5
|
||||
fish_color_command 8caaee
|
||||
fish_color_param eebebe
|
||||
fish_color_keyword ca9ee6
|
||||
fish_color_quote a6d189
|
||||
fish_color_redirection f4b8e4
|
||||
fish_color_end ef9f76
|
||||
fish_color_comment 838ba7
|
||||
fish_color_error e78284
|
||||
fish_color_gray 737994
|
||||
fish_color_selection --background=414559
|
||||
fish_color_search_match --background=414559
|
||||
fish_color_option a6d189
|
||||
fish_color_operator f4b8e4
|
||||
fish_color_escape ea999c
|
||||
fish_color_autosuggestion 737994
|
||||
fish_color_cancel e78284
|
||||
fish_color_cwd e5c890
|
||||
fish_color_user 81c8be
|
||||
fish_color_host 8caaee
|
||||
fish_color_host_remote a6d189
|
||||
fish_color_status e78284
|
||||
fish_pager_color_progress 737994
|
||||
fish_pager_color_prefix f4b8e4
|
||||
fish_pager_color_completion c6d0f5
|
||||
fish_pager_color_description 737994
|
||||
|
||||
@@ -58,3 +58,32 @@ fish_pager_color_progress 6e738d
|
||||
fish_pager_color_prefix f5bde6
|
||||
fish_pager_color_completion cad3f5
|
||||
fish_pager_color_description 6e738d
|
||||
|
||||
[unknown]
|
||||
# preferred_background: 24273a
|
||||
fish_color_normal cad3f5
|
||||
fish_color_command 8aadf4
|
||||
fish_color_param f0c6c6
|
||||
fish_color_keyword c6a0f6
|
||||
fish_color_quote a6da95
|
||||
fish_color_redirection f5bde6
|
||||
fish_color_end f5a97f
|
||||
fish_color_comment 8087a2
|
||||
fish_color_error ed8796
|
||||
fish_color_gray 6e738d
|
||||
fish_color_selection --background=363a4f
|
||||
fish_color_search_match --background=363a4f
|
||||
fish_color_option a6da95
|
||||
fish_color_operator f5bde6
|
||||
fish_color_escape ee99a0
|
||||
fish_color_autosuggestion 6e738d
|
||||
fish_color_cancel ed8796
|
||||
fish_color_cwd eed49f
|
||||
fish_color_user 8bd5ca
|
||||
fish_color_host 8aadf4
|
||||
fish_color_host_remote a6da95
|
||||
fish_color_status ed8796
|
||||
fish_pager_color_progress 6e738d
|
||||
fish_pager_color_prefix f5bde6
|
||||
fish_pager_color_completion cad3f5
|
||||
fish_pager_color_description 6e738d
|
||||
|
||||
@@ -58,3 +58,32 @@ fish_pager_color_progress 6c7086
|
||||
fish_pager_color_prefix f5c2e7
|
||||
fish_pager_color_completion cdd6f4
|
||||
fish_pager_color_description 6c7086
|
||||
|
||||
[unknown]
|
||||
# preferred_background: 1e1e2e
|
||||
fish_color_normal cdd6f4
|
||||
fish_color_command 89b4fa
|
||||
fish_color_param f2cdcd
|
||||
fish_color_keyword cba6f7
|
||||
fish_color_quote a6e3a1
|
||||
fish_color_redirection f5c2e7
|
||||
fish_color_end fab387
|
||||
fish_color_comment 7f849c
|
||||
fish_color_error f38ba8
|
||||
fish_color_gray 6c7086
|
||||
fish_color_selection --background=313244
|
||||
fish_color_search_match --background=313244
|
||||
fish_color_option a6e3a1
|
||||
fish_color_operator f5c2e7
|
||||
fish_color_escape eba0ac
|
||||
fish_color_autosuggestion 6c7086
|
||||
fish_color_cancel f38ba8
|
||||
fish_color_cwd f9e2af
|
||||
fish_color_user 94e2d5
|
||||
fish_color_host 89b4fa
|
||||
fish_color_host_remote a6e3a1
|
||||
fish_color_status f38ba8
|
||||
fish_pager_color_progress 6c7086
|
||||
fish_pager_color_prefix f5c2e7
|
||||
fish_pager_color_completion cdd6f4
|
||||
fish_pager_color_description 6c7086
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*-secret
|
||||
__secret
|
||||
__ignored
|
||||
__ignored/*
|
||||
__test_*.php
|
||||
__test_*.txt
|
||||
__test.php
|
||||
|
||||
1
config/git/overrides/.gitignore
vendored
1
config/git/overrides/.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
!.gitkeep
|
||||
config
|
||||
ignore
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
|
||||
nah = !git reset --hard && git clean -df
|
||||
recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
|
||||
reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
|
||||
reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
|
||||
reset-origin = !git fetch origin && git reset --hard origin/HEAD && git clean -f -d
|
||||
reset-upstream = !git fetch upstream && git reset --hard upstream/HEAD && git clean -f -d
|
||||
rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
|
||||
tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
|
||||
undo = reset --soft HEAD^
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
tap "1password/tap"
|
||||
tap "anchore/grype"
|
||||
tap "cormacrelf/tap"
|
||||
tap "ddosify/tap"
|
||||
tap "dm3ch/tap"
|
||||
tap "doron-cohen/tap"
|
||||
tap "gesquive/tap"
|
||||
tap "github/gh"
|
||||
tap "golangci/tap"
|
||||
tap "homebrew/autoupdate"
|
||||
tap "homebrew/bundle"
|
||||
tap "homebrew/services"
|
||||
tap "jesseduffield/lazygit"
|
||||
tap "k8sgpt-ai/k8sgpt"
|
||||
tap "keith/formulae"
|
||||
tap "koekeishiya/formulae"
|
||||
tap "mongodb/brew"
|
||||
@@ -20,14 +16,9 @@ tap "pantheon-systems/external"
|
||||
tap "reviewdog/tap"
|
||||
tap "shivammathur/extensions"
|
||||
tap "shivammathur/php"
|
||||
tap "snyk/tap"
|
||||
tap "tabbyml/tabby"
|
||||
tap "teamookla/speedtest"
|
||||
tap "xwmx/taps"
|
||||
# Run your GitHub Actions locally
|
||||
brew "act"
|
||||
# Simple, modern, secure file encryption
|
||||
brew "age"
|
||||
# Mozilla CA certificate store
|
||||
brew "ca-certificates"
|
||||
# Mozilla CA bundle for Python
|
||||
@@ -40,10 +31,6 @@ brew "cryptography"
|
||||
brew "libyaml"
|
||||
# Display directories as trees (with optional color/HTML output)
|
||||
brew "tree"
|
||||
# Automate deployment, configuration, and upgrading
|
||||
brew "ansible"
|
||||
# Checks ansible playbooks for practices and behaviour
|
||||
brew "ansible-lint"
|
||||
# Generic-purpose lossless compression algorithm by Google
|
||||
brew "brotli"
|
||||
# Library and utilities for processing GIFs
|
||||
@@ -80,18 +67,12 @@ brew "pkgconf"
|
||||
brew "autogen"
|
||||
# Tool for generating GNU Standards-compliant Makefiles
|
||||
brew "automake"
|
||||
# Official Amazon AWS command-line interface
|
||||
brew "awscli"
|
||||
# GNU internationalization (i18n) and localization (l10n) library
|
||||
brew "gettext"
|
||||
# Bourne-Again SHell, a UNIX command interpreter
|
||||
brew "bash"
|
||||
# Clone of cat(1) with syntax highlighting and Git integration
|
||||
brew "bat"
|
||||
# GNU File, Shell, and Text utilities
|
||||
brew "coreutils"
|
||||
# Bash Automated Testing System
|
||||
brew "bats-core"
|
||||
# Parser generator
|
||||
brew "bison"
|
||||
# Freely available high-quality data compressor
|
||||
@@ -102,22 +83,12 @@ brew "freetype"
|
||||
brew "fontconfig"
|
||||
# Core application library for C
|
||||
brew "glib"
|
||||
# Binary installation for rust projects
|
||||
brew "cargo-binstall"
|
||||
# Multi-platform support library with a focus on asynchronous I/O
|
||||
brew "libuv"
|
||||
# Open-source, cross-platform JavaScript runtime environment
|
||||
brew "node", link: false
|
||||
# CLI tool for analyzing Claude Code usage from local JSONL files
|
||||
brew "ccusage"
|
||||
# JSON Schema CLI
|
||||
brew "check-jsonschema"
|
||||
# Prevent cloud misconfigurations during build-time for IaC tools
|
||||
brew "checkov"
|
||||
# Human-friendly and fast alternative to cut and (sometimes) awk
|
||||
brew "choose-rust"
|
||||
# Cross-platform make
|
||||
brew "cmake"
|
||||
# Get a file from an HTTP, HTTPS or FTP server
|
||||
brew "curl"
|
||||
# Network authentication protocol
|
||||
@@ -154,14 +125,8 @@ brew "flock"
|
||||
brew "freetds"
|
||||
# Monitor a directory for changes and run a shell command
|
||||
brew "fswatch"
|
||||
# Command-line fuzzy finder written in Go
|
||||
brew "fzf"
|
||||
# Graphics library to dynamically manipulate images
|
||||
brew "gd"
|
||||
# Disk usage analyzer with console interface written in Go
|
||||
brew "gdu"
|
||||
# GitHub command-line tool
|
||||
brew "gh"
|
||||
# Distributed revision control system
|
||||
brew "git"
|
||||
# Enable transparent encryption/decryption of files in a git repo
|
||||
@@ -170,14 +135,10 @@ brew "git-crypt"
|
||||
brew "git-extras"
|
||||
# Browse your latest git branches, formatted real fancy
|
||||
brew "git-recent"
|
||||
# Render markdown on the CLI
|
||||
brew "glow"
|
||||
# GNU implementation of the famous stream editor
|
||||
brew "gnu-sed"
|
||||
# GNU Pretty Good Privacy (PGP) package
|
||||
brew "gnupg"
|
||||
# Go version management
|
||||
brew "goenv"
|
||||
# Library access to GnuPG
|
||||
brew "gpgme"
|
||||
# Manage your GnuPG keys with ease!
|
||||
@@ -190,8 +151,6 @@ brew "librsvg"
|
||||
brew "graphviz"
|
||||
# GNU grep, egrep and fgrep
|
||||
brew "grep"
|
||||
# Vulnerability scanner for container images and filesystems
|
||||
brew "grype"
|
||||
# Popular GNU data compression program
|
||||
brew "gzip"
|
||||
# Improved top (interactive process viewer)
|
||||
@@ -206,8 +165,6 @@ brew "imagemagick"
|
||||
brew "irssi"
|
||||
# Image manipulation library
|
||||
brew "jpeg"
|
||||
# Lightweight and flexible command-line JSON processor
|
||||
brew "jq"
|
||||
# JSON parser for C
|
||||
brew "json-c"
|
||||
# Crawling and spidering framework
|
||||
@@ -244,8 +201,6 @@ brew "nginx"
|
||||
brew "nmap"
|
||||
# Libraries for security-enabled client and server applications
|
||||
brew "nss"
|
||||
# Command-line Git information tool
|
||||
brew "onefetch"
|
||||
# General-purpose speech recognition model
|
||||
brew "openai-whisper"
|
||||
# Open source suite of directory software
|
||||
@@ -258,46 +213,18 @@ brew "php", link: false
|
||||
brew "php@8.2", link: true
|
||||
# General-purpose scripting language
|
||||
brew "php@8.3"
|
||||
# Pins GitHub Actions to full hashes and versions
|
||||
brew "pinact"
|
||||
# Python version management
|
||||
brew "pyenv"
|
||||
# Migrate pip packages from one Python version to another
|
||||
brew "pyenv-pip-migrate"
|
||||
# Pyenv plugin to manage virtualenv
|
||||
brew "pyenv-virtualenv"
|
||||
# Interpreted, interactive, object-oriented programming language
|
||||
brew "python@3.11"
|
||||
# Install various Ruby versions and implementations
|
||||
brew "ruby-build"
|
||||
# Ruby version manager
|
||||
brew "rbenv"
|
||||
# Generate C-based recognizers from regular expressions
|
||||
brew "re2c"
|
||||
# Rust toolchain installer
|
||||
brew "rustup"
|
||||
# Static analysis and lint tool, for (ba)sh scripts
|
||||
brew "shellcheck"
|
||||
# User interface to the TELNET protocol
|
||||
brew "telnet"
|
||||
# Send macOS User Notifications from the command-line
|
||||
brew "terminal-notifier"
|
||||
# Tool which checks for the support of TLS/SSL ciphers and flaws
|
||||
brew "testssl"
|
||||
# Terraform version manager inspired by rbenv
|
||||
brew "tfenv"
|
||||
# Linter for Terraform files
|
||||
brew "tflint"
|
||||
# Static analysis security scanner for your terraform code
|
||||
brew "tfsec"
|
||||
# Terminal multiplexer
|
||||
brew "tmux"
|
||||
# Extremely fast Python package installer and resolver, written in Rust
|
||||
brew "uv"
|
||||
# Tool for creating isolated virtual python environments
|
||||
brew "virtualenv"
|
||||
# Command-line interface to the WakaTime api
|
||||
brew "wakatime-cli"
|
||||
# Executes a program periodically, showing output fullscreen
|
||||
brew "watch"
|
||||
# Internet file retriever
|
||||
@@ -336,8 +263,6 @@ brew "shivammathur/extensions/yaml@8.3"
|
||||
brew "shivammathur/php/php-debug"
|
||||
# General-purpose scripting language
|
||||
brew "shivammathur/php/php@8.2-debug"
|
||||
# Find & fix known vulnerabilities in open-source dependencies
|
||||
brew "snyk/tap/snyk"
|
||||
# Tabby: AI Coding Assistant
|
||||
brew "tabbyml/tabby/tabby"
|
||||
# Command-line interface for 1Password
|
||||
|
||||
@@ -1,4 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.config/nvm"
|
||||
[[ -s "$NVM_DIR/nvm.sh" ]] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||
eval "$(mise activate --shims)"
|
||||
|
||||
@@ -1,68 +1,68 @@
|
||||
{
|
||||
"profiles": [
|
||||
{
|
||||
"complex_modifications": {
|
||||
"rules": [
|
||||
{
|
||||
"description": "Change right_command+hjkl to arrow keys",
|
||||
"manipulators": [
|
||||
{
|
||||
"from": {
|
||||
"key_code": "h",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "left_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "j",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "down_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "k",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "up_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "l",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "right_arrow" }],
|
||||
"type": "basic"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"name": "Default profile",
|
||||
"selected": true,
|
||||
"simple_modifications": [
|
||||
"profiles": [
|
||||
{
|
||||
"from": { "key_code": "caps_lock" },
|
||||
"to": [{ "key_code": "f18" }]
|
||||
"complex_modifications": {
|
||||
"rules": [
|
||||
{
|
||||
"description": "Change right_command+hjkl to arrow keys",
|
||||
"manipulators": [
|
||||
{
|
||||
"from": {
|
||||
"key_code": "h",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "left_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "j",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "down_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "k",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "up_arrow" }],
|
||||
"type": "basic"
|
||||
},
|
||||
{
|
||||
"from": {
|
||||
"key_code": "l",
|
||||
"modifiers": {
|
||||
"mandatory": ["right_command"],
|
||||
"optional": ["any"]
|
||||
}
|
||||
},
|
||||
"to": [{ "key_code": "right_arrow" }],
|
||||
"type": "basic"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"name": "Default profile",
|
||||
"selected": true,
|
||||
"simple_modifications": [
|
||||
{
|
||||
"from": { "key_code": "caps_lock" },
|
||||
"to": [{ "key_code": "f18" }]
|
||||
}
|
||||
],
|
||||
"virtual_hid_keyboard": { "keyboard_type_v2": "iso" }
|
||||
}
|
||||
],
|
||||
"virtual_hid_keyboard": { "keyboard_type_v2": "iso" }
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
105
config/mise/config.toml
Normal file
105
config/mise/config.toml
Normal file
@@ -0,0 +1,105 @@
|
||||
[tools]
|
||||
# Language runtimes
|
||||
node = "lts"
|
||||
python = "3"
|
||||
go = "latest"
|
||||
rust = "stable"
|
||||
|
||||
# Pre-built binaries via ubi (fast — no compilation)
|
||||
"ubi:sharkdp/fd" = "latest"
|
||||
"ubi:BurntSushi/ripgrep" = "latest"
|
||||
"ubi:eza-community/eza" = "latest"
|
||||
"ubi:ClementTsang/bottom" = "latest"
|
||||
"ubi:ajeetdsouza/zoxide" = "latest"
|
||||
"ubi:tree-sitter/tree-sitter" = "latest"
|
||||
"ubi:neovim/neovim" = "latest" # Neovim editor binary
|
||||
"ubi:dandavison/delta" = "latest"
|
||||
|
||||
# Cargo-based tools (no pre-built binary available)
|
||||
"cargo:bkt" = "latest"
|
||||
"cargo:difftastic" = "latest"
|
||||
"cargo:tmux-sessionizer" = "latest"
|
||||
|
||||
# Go-based tools
|
||||
"go:github.com/google/yamlfmt/cmd/yamlfmt" = "latest"
|
||||
"go:github.com/cheat/cheat/cmd/cheat" = "latest"
|
||||
"go:github.com/charmbracelet/glow" = "latest"
|
||||
"go:github.com/junegunn/fzf" = "latest"
|
||||
"go:github.com/charmbracelet/gum" = "latest"
|
||||
"go:github.com/joshmedeski/sesh/v2" = "latest"
|
||||
"go:github.com/dotzero/git-profile" = "latest"
|
||||
|
||||
# npm-based tools
|
||||
"npm:editorconfig-checker" = "latest"
|
||||
"npm:github-release-notes" = "latest"
|
||||
"npm:neovim" = "latest" # Node.js client for Neovim's RPC API (required by plugins)
|
||||
"npm:corepack" = "latest"
|
||||
|
||||
# Python tools (via pipx backend)
|
||||
"pipx:ansible" = "latest"
|
||||
"pipx:ansible-lint" = "latest"
|
||||
"pipx:ruff" = "latest"
|
||||
"pipx:openapi-python-client" = "latest"
|
||||
|
||||
# .NET tools (via dotnet backend)
|
||||
"dotnet:coverlet.console" = "latest"
|
||||
"dotnet:csharp-ls" = "latest"
|
||||
"dotnet:csharpier" = "latest"
|
||||
"dotnet:ilspycmd" = "latest"
|
||||
"dotnet:dotnet-ef" = "latest"
|
||||
|
||||
# DevOps & security tools
|
||||
act = "latest"
|
||||
age = "latest"
|
||||
aws-cli = "latest"
|
||||
checkov = "latest"
|
||||
grype = "latest"
|
||||
pinact = "latest"
|
||||
snyk = "latest"
|
||||
|
||||
# Dev tools (pre-built binaries)
|
||||
lazygit = "latest"
|
||||
bat = "latest"
|
||||
bats = "latest"
|
||||
choose = "latest"
|
||||
cmake = "latest"
|
||||
gdu = "latest"
|
||||
github-cli = "latest"
|
||||
jq = "latest"
|
||||
shellcheck = "latest"
|
||||
shfmt = "latest"
|
||||
stylua = "latest"
|
||||
actionlint = "latest"
|
||||
"aqua:mpalmer/action-validator" = "latest"
|
||||
oh-my-posh = "latest"
|
||||
"ubi:o2sh/onefetch" = "latest"
|
||||
"ubi:wakatime/wakatime-cli" = "latest"
|
||||
|
||||
# Terraform (replaces tfenv)
|
||||
terraform = "latest"
|
||||
tflint = "latest"
|
||||
tfsec = "latest"
|
||||
|
||||
# Other useful tools
|
||||
uv = "latest"
|
||||
|
||||
[settings]
|
||||
trusted_config_paths = [
|
||||
"~/Code/ivuorinen",
|
||||
"~/Code/s",
|
||||
"~/Code/masf",
|
||||
]
|
||||
# Respect .nvmrc, .python-version, .ruby-version, etc. in other projects.
|
||||
# This repo uses .mise.toml at the repo root for pinned versions.
|
||||
idiomatic_version_file = true
|
||||
idiomatic_version_file_enable_tools = [
|
||||
"node", "python", "ruby", "go", "java",
|
||||
"terraform", "yarn", "bun", "deno", "dotnet",
|
||||
]
|
||||
|
||||
# Generate mise.lock for reproducible installs
|
||||
lockfile = true
|
||||
|
||||
# Save disk space — don't keep downloaded archives or failed installs
|
||||
always_keep_download = false
|
||||
always_keep_install = false
|
||||
@@ -2,7 +2,7 @@
|
||||
-- │ ivuorinen's Neovim configuration │
|
||||
-- ╰─────────────────────────────────────────────────────────╯
|
||||
|
||||
-- ── Install lazylazy ────────────────────────────────────────────────
|
||||
-- ── Install lazy ────────────────────────────────────────────────────
|
||||
-- https://github.com/folke/lazy.nvim
|
||||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
@@ -27,8 +27,12 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- ── Add ~/.local/bin to the PATH ────────────────────────────────────
|
||||
vim.fn.setenv('PATH', vim.fn.expand '$HOME/.local/bin' .. ':' .. vim.fn.expand '$PATH')
|
||||
-- ── Add mise shims and ~/.local/bin to the PATH ───────────────────────
|
||||
vim.env.PATH = vim.env.HOME
|
||||
.. '/.local/share/mise/shims:'
|
||||
.. vim.env.HOME
|
||||
.. '/.local/bin:'
|
||||
.. vim.env.PATH
|
||||
|
||||
require 'options'
|
||||
require 'autogroups'
|
||||
@@ -53,7 +57,7 @@ require('lazy').setup(
|
||||
path = '~/Code/nvim', -- Load wip plugins from this path
|
||||
},
|
||||
install = {
|
||||
colorscheme = { vim.g.colors_theme },
|
||||
colorscheme = { 'catppuccin' },
|
||||
},
|
||||
profiling = {
|
||||
loader = true,
|
||||
@@ -61,8 +65,6 @@ require('lazy').setup(
|
||||
}
|
||||
)
|
||||
|
||||
-- require('nvm-default').setup()
|
||||
|
||||
require 'keymaps'
|
||||
|
||||
-- vim: set ts=2 sts=2 sw=2 wrap et :
|
||||
|
||||
@@ -28,7 +28,6 @@ K.d('<C-k>', { 'n', 'v' }, ":m '<-2<CR>gv=gv", 'Move Block Up')
|
||||
K.d('<C-j>', { 'n', 'v' }, ":m '>+1<CR>gv=gv", 'Move Block Down')
|
||||
|
||||
-- ── Other operations ────────────────────────────────────────────────
|
||||
K.nl('o', function() require('snacks').gitbrowse() end, 'Open repo in browser')
|
||||
K.n('<C-s>', ':w!<cr>', { desc = 'Save', noremap = true })
|
||||
K.n('<esc><esc>', ':nohlsearch<cr>', { desc = 'Clear Search Highlighting' })
|
||||
|
||||
@@ -59,7 +58,6 @@ K.ld('cci', 'n', function() b().lsp_incoming_calls() end, 'Incoming calls')
|
||||
K.ld('cco', 'n', function() b().lsp_outgoing_calls() end, 'Outgoing calls')
|
||||
K.ld('cd', 'n', function() b().lsp_definitions() end, 'Definitions')
|
||||
K.ld('cf', { 'n', 'x' }, ':lua vim.lsp.buf.format()<CR>', 'Format')
|
||||
K.ld('cg', 'n', ':lua require("neogen").generate()<CR>', 'Generate annotations')
|
||||
K.ld('ci', 'n', function() b().lsp_implementations() end, 'Implementations')
|
||||
K.ld('cp', 'n', function() b().lsp_type_definitions() end, 'Type Definition')
|
||||
K.ld('cr', 'n', vim.lsp.buf.rename, 'Rename')
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
-- Get nvm default version and use it in node_host_prog
|
||||
-- and g.copilot_node_command.
|
||||
--
|
||||
-- This module automatically configures Neovim to use the default Node.js version
|
||||
-- from NVM. It requires a working NVM installation and 'default' alias to be set,
|
||||
-- and also neovim npm package to be installed.
|
||||
--
|
||||
-- You can install the neovim package by running:
|
||||
-- npm i --global neovim
|
||||
--
|
||||
-- Usage:
|
||||
-- require('nvm-default').setup({
|
||||
-- add_to_path = true, -- optional: add NVM bin directory to PATH
|
||||
-- nvm_path = "~/.nvm", -- optional: custom NVM installation path
|
||||
-- notify_level = "info" -- optional: notification level
|
||||
-- })
|
||||
|
||||
local M = {}
|
||||
|
||||
M.name = 'nvm-default.nvim'
|
||||
M.version = '0.1.0' -- x-release-please-version
|
||||
|
||||
-- Helper function to run a shell command
|
||||
---@param cmd string Run a shell command
|
||||
---@return string? Return the result of the command
|
||||
local function run_command(cmd)
|
||||
local result = vim.fn.system(cmd)
|
||||
return vim.v.shell_error == 0 and result:gsub('%s+$', '') or nil
|
||||
end
|
||||
|
||||
-- Helper function to show a notification
|
||||
---@param msg string Show a message
|
||||
---@param level "info"|"warn"|"error"|"trace" Notification level
|
||||
local function n(msg, level)
|
||||
if msg == nil then msg = M.name .. ': No message provided' end
|
||||
if level == nil then level = 'trace' end
|
||||
|
||||
local log_level = vim.log.levels.INFO
|
||||
|
||||
if level == 'info' then
|
||||
log_level = vim.log.levels.INFO
|
||||
elseif level == 'warn' then
|
||||
log_level = vim.log.levels.WARN
|
||||
elseif level == 'error' then
|
||||
log_level = vim.log.levels.ERROR
|
||||
elseif level == 'trace' then
|
||||
log_level = vim.log.levels.TRACE
|
||||
end
|
||||
|
||||
vim.notify(M.name .. ': ' .. msg, log_level)
|
||||
end
|
||||
|
||||
---@class NvmDefaultOptions
|
||||
---@field add_to_path boolean Add found NVM bin directory to PATH
|
||||
---@field nvm_path string Where nvm installation is located
|
||||
---@field notify_level number|"info"|"warn"|"error"|"trace" Notification level filter
|
||||
|
||||
-- Default options
|
||||
---@type NvmDefaultOptions
|
||||
M.defaults = {
|
||||
add_to_path = vim.g.nvm_default_add_to_path or true,
|
||||
nvm_path = vim.fn.expand(os.getenv 'NVM_DIR' or '~/.nvm'),
|
||||
notify_level = vim.g.nvm_default_notify_level or 'info',
|
||||
}
|
||||
|
||||
-- Fetch the NVM default version or fallback to node version
|
||||
---@param opts? NvmDefaultOptions Plugin options
|
||||
function M.setup(opts)
|
||||
local options = vim.tbl_deep_extend('force', M.defaults, opts or {})
|
||||
|
||||
local nvm_path = options.nvm_path
|
||||
local node_version = run_command(
|
||||
string.format('. %s/nvm.sh && nvm version default', nvm_path)
|
||||
) or run_command(string.format('. %s/nvm.sh && nvm version node', nvm_path)) or nil
|
||||
|
||||
if node_version and node_version:match '^v' then
|
||||
-- Set vim.g.node_host_prog and vim.g.copilot_node_command
|
||||
local current_nvm_version_path =
|
||||
string.format('%s/versions/node/%s', nvm_path, node_version)
|
||||
local current_nvm_node_bin_path = string.format('%s/bin', current_nvm_version_path)
|
||||
local current_nvm_node_bin = string.format('%s/node', current_nvm_node_bin_path)
|
||||
local neovim_node_host_bin_path =
|
||||
string.format('%s/neovim-node-host', current_nvm_node_bin_path)
|
||||
|
||||
-- Collect missing files and directories errors for error output
|
||||
local missing = {}
|
||||
|
||||
-- If node_dir isn't there, stop and show error
|
||||
if not vim.fn.isdirectory(current_nvm_version_path) then
|
||||
table.insert(missing, 'Node.js directory: ' .. current_nvm_version_path)
|
||||
end
|
||||
|
||||
-- If node_bin isn't there, stop and show error
|
||||
if not vim.fn.filereadable(current_nvm_node_bin) then
|
||||
table.insert(missing, 'Node.js binary: ' .. current_nvm_node_bin)
|
||||
end
|
||||
|
||||
if not vim.fn.filereadable(neovim_node_host_bin_path) then
|
||||
table.insert(missing, 'Neovim host binary: ' .. neovim_node_host_bin_path)
|
||||
end
|
||||
|
||||
if #missing > 0 then
|
||||
n('Missing required files:\n- ' .. table.concat(missing, '\n- '), 'error')
|
||||
return
|
||||
end
|
||||
|
||||
-- Add to PATH if requested. Can be turned off by setting if it messes with
|
||||
-- other tools.
|
||||
if options.add_to_path then
|
||||
vim.env.PATH = current_nvm_node_bin_path .. ':' .. vim.env.PATH
|
||||
end
|
||||
|
||||
vim.g.node_host_prog = neovim_node_host_bin_path
|
||||
vim.g.copilot_node_command = current_nvm_node_bin
|
||||
else
|
||||
n('Unable to determine the Node.js version from nvm.', 'error')
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
@@ -13,10 +13,6 @@ local a = vim.api -- A table to store API functions
|
||||
g.mapleader = ' ' -- Space as the leader key
|
||||
g.maplocalleader = ' ' -- Space as the local leader key
|
||||
|
||||
-- g.colors_theme = 'onedark' -- Set the colorscheme
|
||||
-- g.colors_variant_light = 'tokyonight-day' -- Set the light variant
|
||||
-- g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
|
||||
|
||||
g.editorconfig = true -- Make sure editorconfig support is enabled
|
||||
g.loaded_perl_provider = 0 -- Disable perl provider
|
||||
g.loaded_ruby_provider = 0 -- Disable ruby provider
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
return {
|
||||
-- Performant, batteries-included completion plugin for Neovim
|
||||
-- https:/github.com/saghen/blink.cmp
|
||||
-- https://github.com/saghen/blink.cmp
|
||||
{
|
||||
'saghen/blink.cmp',
|
||||
version = '*',
|
||||
|
||||
@@ -24,7 +24,14 @@ return {
|
||||
-- https://github.com/fatih/vim-go
|
||||
{
|
||||
'fatih/vim-go',
|
||||
config = function() end,
|
||||
ft = 'go',
|
||||
config = function()
|
||||
vim.g.go_def_mode = 'gopls'
|
||||
vim.g.go_info_mode = 'gopls'
|
||||
vim.g.go_fmt_autosave = 0
|
||||
vim.g.go_imports_autosave = 0
|
||||
vim.g.go_mod_fmt_autosave = 0
|
||||
end,
|
||||
},
|
||||
|
||||
-- Clarify and beautify your comments using boxes and lines.
|
||||
|
||||
@@ -223,7 +223,7 @@ return {
|
||||
vim.env.VIMRUNTIME,
|
||||
}
|
||||
client.config.settings.Lua.runtime = { version = 'LuaJIT' }
|
||||
client.notify(
|
||||
client:notify(
|
||||
'workspace/didChangeConfiguration',
|
||||
{ settings = client.config.settings }
|
||||
)
|
||||
|
||||
@@ -89,15 +89,12 @@ return {
|
||||
'f-person/auto-dark-mode.nvim',
|
||||
opts = {
|
||||
update_interval = 1000,
|
||||
-- stylua: ignore
|
||||
set_dark_mode = function()
|
||||
vim.api.nvim_set_option_value('background', 'dark', {})
|
||||
-- vim.cmd.colorscheme(vim.g.colors_variant_dark)
|
||||
-- vim.cmd 'colorscheme rose-pine'
|
||||
end,
|
||||
set_light_mode = function()
|
||||
vim.api.nvim_set_option_value('background', 'light', {})
|
||||
-- vim.cmd.colorscheme(vim.g.colors_variant_light)
|
||||
-- vim.cmd 'colorscheme rose-pine-dawn'
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -100,5 +100,6 @@ function GetIntelephenseLicense()
|
||||
local f = assert(io.open(p, 'rb'))
|
||||
local content = f:read '*a'
|
||||
f:close()
|
||||
return string.gsub(content, '%s+', '')[1] or nil
|
||||
local stripped = string.gsub(content, '%s+', '')
|
||||
return stripped == '' and nil or stripped
|
||||
end
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
# $NVM_DIR/default-packages
|
||||
|
||||
yarn
|
||||
neovim
|
||||
corepack
|
||||
@@ -71,7 +71,6 @@ x-set-env XDG_BIN_HOME "$HOME/.local/bin"
|
||||
x-path-prepend "/usr/local/bin"
|
||||
x-path-prepend "/opt/homebrew/bin"
|
||||
x-path-prepend "$XDG_DATA_HOME/cargo/bin"
|
||||
x-path-prepend "$XDG_DATA_HOME/bob/nvim-bin"
|
||||
x-path-prepend "$DOTFILES/local/bin"
|
||||
x-path-prepend "$XDG_BIN_HOME"
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
# -u : Unset the specified option.
|
||||
|
||||
set -as terminal-features ",xterm-256color:RGB:clipboard:usstyle:strikethrough:overline"
|
||||
set -g allow-passthrough on # Let apps query outer terminal (OSC 11 for fish theme detection)
|
||||
|
||||
set -s escape-time 0 # Address vim mode switching delay
|
||||
set -s set-clipboard on # System clipboard via OSC 52
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
"
|
||||
" vim: ts=2 sw=2 expandtab
|
||||
" vint: +ProhibitAbbreviationOption +ProhibitSetNoCompatible
|
||||
|
||||
" mise — add shims to PATH for tool discovery
|
||||
let $PATH = $HOME . '/.local/bin:' . $HOME . '/.local/share/mise/shims:' . $PATH
|
||||
"*****************************************************************************
|
||||
"" Vim-Plug core
|
||||
"*****************************************************************************
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
# Plugin configurations
|
||||
zstyle ':antidote:bundle' use-friendly-names 'yes'
|
||||
zstyle ':omz:update' mode reminder
|
||||
zstyle ':omz:plugins:nvm' autoload yes
|
||||
|
||||
# Pure prompt settings
|
||||
export PURE_PROMPT_SYMBOL='➜'
|
||||
|
||||
@@ -24,14 +24,10 @@ ohmyzsh/ohmyzsh path:plugins/fzf
|
||||
ohmyzsh/ohmyzsh path:plugins/git
|
||||
ohmyzsh/ohmyzsh path:plugins/golang
|
||||
ohmyzsh/ohmyzsh path:plugins/gpg-agent
|
||||
ohmyzsh/ohmyzsh path:plugins/nvm
|
||||
ohmyzsh/ohmyzsh path:plugins/python
|
||||
# ohmyzsh/ohmyzsh path:plugins/tmux
|
||||
ohmyzsh/ohmyzsh path:plugins/z
|
||||
|
||||
# Automatically activate nvm if .nvmrc file is present
|
||||
ivuorinen/nvm-auto-use
|
||||
|
||||
# Add core plugins that make Zsh a bit more like Fish
|
||||
zdharma-continuum/fast-syntax-highlighting
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
vcs # git status
|
||||
# command_execution_time # previous command duration
|
||||
go
|
||||
nvm
|
||||
asdf
|
||||
aws
|
||||
# =========================[ Line #2 ]=========================
|
||||
newline # \n
|
||||
@@ -121,8 +121,8 @@
|
||||
# Don't show context unless root or in SSH.
|
||||
# typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION=
|
||||
|
||||
# aws, go and nvm versions colors.
|
||||
typeset -g POWERLEVEL9K_{AWS,GO,NVM}_FOREGROUND=$grey
|
||||
# aws, go and asdf versions colors.
|
||||
typeset -g POWERLEVEL9K_{AWS,GO,ASDF}_FOREGROUND=$grey
|
||||
|
||||
# Show previous command duration only if it's >= 86400s = 24h.
|
||||
typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=86400
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
# shellcheck disable=SC1071,SC1103,SC2148
|
||||
# Source: https://github.com/nvm-sh/nvm#zsh
|
||||
# place this after nvm initialization!
|
||||
autoload -U add-zsh-hook
|
||||
|
||||
load-nvmrc() {
|
||||
local nvmrc_path
|
||||
nvmrc_path="$(nvm_find_nvmrc)"
|
||||
|
||||
if [ -n "$nvmrc_path" ]; then
|
||||
local nvmrc_node_version
|
||||
nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
|
||||
|
||||
if [ "$nvmrc_node_version" = "N/A" ]; then
|
||||
nvm install
|
||||
elif [ "$nvmrc_node_version" != "$(nvm version)" ]; then
|
||||
nvm use
|
||||
fi
|
||||
elif [ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ] && [ "$(nvm version)" != "$(nvm version default)" ]; then
|
||||
echo "Reverting to nvm default version"
|
||||
nvm use default
|
||||
fi
|
||||
}
|
||||
|
||||
add-zsh-hook chpwd load-nvmrc
|
||||
load-nvmrc
|
||||
@@ -2,6 +2,9 @@
|
||||
[include]
|
||||
path = ~/.dotfiles/config/git/shared
|
||||
|
||||
[core]
|
||||
excludesfile = ~/.config/git/overrides/ignore
|
||||
|
||||
[gpg]
|
||||
format = ssh
|
||||
|
||||
|
||||
31
hosts/s/config/git/overrides/ignore
Normal file
31
hosts/s/config/git/overrides/ignore
Normal file
@@ -0,0 +1,31 @@
|
||||
.DS_Store
|
||||
.idea
|
||||
.run
|
||||
*.cache
|
||||
*~
|
||||
|
||||
*-secret
|
||||
__secret
|
||||
__ignored
|
||||
__test_*.php
|
||||
__test_*.txt
|
||||
__test.php
|
||||
_theme
|
||||
*.sql.gz
|
||||
*.WordPress.*.xml
|
||||
cachegrind.out.*
|
||||
composer.phar
|
||||
wp_*.sh
|
||||
auth.json
|
||||
dfm.sh
|
||||
.scannerwork
|
||||
.phpactor.json
|
||||
.zsh_history
|
||||
|
||||
**/.claude/*
|
||||
**/.serena/*
|
||||
**/docs/plans/*
|
||||
**/docs/superpowers/*
|
||||
CLAUDE.md
|
||||
TODO.md
|
||||
specs.md
|
||||
@@ -40,7 +40,7 @@
|
||||
glob: true
|
||||
relink: true
|
||||
path: config/*
|
||||
exclude: [config/nvm, config/fzf, config/op]
|
||||
exclude: [config/fzf, config/op]
|
||||
# 1Password CLI plugins
|
||||
~/.config/op/plugins.sh:
|
||||
relink: true
|
||||
@@ -68,6 +68,11 @@
|
||||
glob: true
|
||||
mode: 0600
|
||||
path: ssh/*
|
||||
# mise → asdf compatibility (tools expecting ~/.asdf find mise data)
|
||||
~/.asdf:
|
||||
path: ~/.local/share/mise
|
||||
relink: true
|
||||
force: true
|
||||
|
||||
- shell:
|
||||
# Add Git submodules and remove old ones
|
||||
|
||||
116
local/bin/dfm
116
local/bin/dfm
@@ -73,21 +73,18 @@ section_install()
|
||||
MENU=(
|
||||
"all:Installs everything in the correct order"
|
||||
"apt-packages:Install apt packages (Debian/Ubuntu)"
|
||||
"cargo:Install rust/cargo packages"
|
||||
"cheat-databases:Install cheat external cheatsheet databases"
|
||||
"composer:Install composer"
|
||||
"dnf-packages:Install dnf packages (Fedora/RHEL)"
|
||||
"fonts:Install programming fonts"
|
||||
"gh:Install GitHub CLI Extensions"
|
||||
"git-crypt:Install git-crypt from source"
|
||||
"go:Install Go Packages"
|
||||
"imagick:Install ImageMagick CLI"
|
||||
"macos:Setup nice macOS defaults"
|
||||
"npm-packages:Install NPM Packages"
|
||||
"mise:Install tools via mise (runtimes + CLI tools)"
|
||||
"mise-cleanup:Remove old version manager installations (--dry-run supported)"
|
||||
"ntfy:Install ntfy notification tool"
|
||||
"nvm-latest:Install latest lts node using nvm"
|
||||
"nvm:Install Node Version Manager (nvm)"
|
||||
"python-packages:Install Python packages via uv"
|
||||
"python-libs:Install Python libraries (libtmux, pynvim)"
|
||||
"shellspec:Install shellspec testing framework"
|
||||
"xcode-cli-tools:Install Xcode CLI tools (macOS)"
|
||||
"z:Install z"
|
||||
@@ -107,13 +104,10 @@ section_install()
|
||||
$0 brew install
|
||||
$0 install fonts
|
||||
|
||||
# Tier 2: Language packages (depend on runtimes from Tier 1)
|
||||
$0 install cargo
|
||||
$0 install go
|
||||
$0 install composer
|
||||
$0 install nvm
|
||||
$0 install npm-packages
|
||||
$0 install python-packages
|
||||
# Tier 2: Runtimes and CLI tools via mise, then remaining installers
|
||||
$0 install mise || exit 1
|
||||
$0 install composer || exit 1
|
||||
$0 install python-libs || exit 1
|
||||
|
||||
# Tier 3: Tool-dependent installers
|
||||
$0 install cheat-databases
|
||||
@@ -131,12 +125,6 @@ section_install()
|
||||
msgr yay "All done!"
|
||||
;;
|
||||
|
||||
cargo)
|
||||
msgr run "Installing cargo packages..."
|
||||
bash "$DOTFILES/scripts/install-cargo-packages.sh" \
|
||||
&& msgr yay "cargo packages installed!"
|
||||
;;
|
||||
|
||||
cheat-databases)
|
||||
msgr run "Installing cheat databases..."
|
||||
for database in "$DOTFILES"/scripts/install-cheat-*.sh; do
|
||||
@@ -163,12 +151,6 @@ section_install()
|
||||
&& msgr yay "github cli extensions installed!"
|
||||
;;
|
||||
|
||||
go)
|
||||
msgr run "Installing Go Packages..."
|
||||
bash "$DOTFILES/scripts/install-go-packages.sh" \
|
||||
&& msgr yay "go packages installed!"
|
||||
;;
|
||||
|
||||
imagick)
|
||||
msgr run "Downloading and installing ImageMagick CLI..."
|
||||
curl -L https://imagemagick.org/archive/binaries/magick > "$XDG_BIN_HOME/magick" \
|
||||
@@ -182,33 +164,30 @@ section_install()
|
||||
&& msgr yay "macOS defaults set!"
|
||||
;;
|
||||
|
||||
nvm)
|
||||
msgr run "Installing nvm..."
|
||||
local NVM_VERSION
|
||||
NVM_VERSION=$(x-gh-get-latest-version nvm-sh/nvm)
|
||||
msgr ok "Latest nvm version: $NVM_VERSION"
|
||||
local NVM_INSTALL="https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh"
|
||||
local NVM_CURL="curl -o- \"$NVM_INSTALL\" | bash"
|
||||
PROFILE=/dev/null bash -c "$NVM_CURL"
|
||||
$0 install nvm-latest
|
||||
msgr yay "nvm installed!"
|
||||
;;
|
||||
|
||||
nvm-latest)
|
||||
msgr run "Installing latest lts node..."
|
||||
if [ -n "$NVM_DIR" ]; then
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
mise)
|
||||
msgr run "Installing tools via mise..."
|
||||
if ! command -v mise &> /dev/null; then
|
||||
msgr nested "Installing mise..."
|
||||
if ! curl https://mise.run | sh; then
|
||||
msgr err "Failed to install mise"
|
||||
exit 1
|
||||
fi
|
||||
export PATH="${XDG_BIN_HOME:-$HOME/.local/bin}:$PATH"
|
||||
fi
|
||||
nvm install --lts --latest-npm --default
|
||||
git checkout "$DOTFILES/base/zshrc"
|
||||
git checkout "$DOTFILES/base/bashrc"
|
||||
msgr yay "latest lts node installed!"
|
||||
if ! mise install --yes; then
|
||||
msgr err "mise install failed"
|
||||
exit 1
|
||||
fi
|
||||
if ! mise reshim; then
|
||||
msgr err "mise reshim failed"
|
||||
exit 1
|
||||
fi
|
||||
msgr yay "mise tools installed!"
|
||||
;;
|
||||
|
||||
npm-packages)
|
||||
msgr run "NPM Packages install started..."
|
||||
bash "$DOTFILES/scripts/install-npm-packages.sh" \
|
||||
&& msgr yay "NPM Packages have been installed!"
|
||||
mise-cleanup)
|
||||
msgr run "Cleaning up old version manager installations..."
|
||||
bash "$DOTFILES/scripts/cleanup-old-version-managers.sh" "${@:2}"
|
||||
;;
|
||||
|
||||
apt-packages)
|
||||
@@ -235,10 +214,10 @@ section_install()
|
||||
&& msgr yay "ntfy installed!"
|
||||
;;
|
||||
|
||||
python-packages)
|
||||
msgr run "Installing Python packages..."
|
||||
python-libs)
|
||||
msgr run "Installing Python libraries..."
|
||||
bash "$DOTFILES/scripts/install-python-packages.sh" \
|
||||
&& msgr yay "Python packages installed!"
|
||||
&& msgr yay "Python libraries installed!"
|
||||
;;
|
||||
|
||||
xcode-cli-tools)
|
||||
@@ -289,8 +268,11 @@ section_brew()
|
||||
;;
|
||||
|
||||
update)
|
||||
brew update && brew outdated && brew upgrade && brew cleanup
|
||||
msgr yay "Done!"
|
||||
if brew update && brew outdated && brew upgrade && brew cleanup; then
|
||||
msgr yay "Done!"
|
||||
else
|
||||
msgr err "brew update failed"
|
||||
fi
|
||||
;;
|
||||
|
||||
updatebundle)
|
||||
@@ -549,9 +531,9 @@ section_dotfiles()
|
||||
case "$1" in
|
||||
fmt)
|
||||
msgr run "Running all formatters"
|
||||
$0 dotfiles yamlfmt
|
||||
$0 dotfiles shfmt
|
||||
msgr run_done "...done!"
|
||||
$0 dotfiles yamlfmt \
|
||||
&& $0 dotfiles shfmt \
|
||||
&& msgr run_done "...done!"
|
||||
;;
|
||||
|
||||
reset_all)
|
||||
@@ -565,12 +547,16 @@ section_dotfiles()
|
||||
~/.local/share/nvim \
|
||||
~/.local/state/nvim \
|
||||
~/.cache/nvim \
|
||||
~/.config/nvim
|
||||
msgr ok "Deleted old nvim files (share, state and cache + config)"
|
||||
ln -s "$DOTFILES/config/nvim" ~/.config/nvim
|
||||
msgr ok "Linked nvim and astronvim"
|
||||
x-have npm && $0 install npm
|
||||
msgr ok "Installed packages"
|
||||
~/.config/nvim \
|
||||
&& msgr ok "Deleted old nvim files (share, state and cache + config)"
|
||||
ln -s "$DOTFILES/config/nvim" ~/.config/nvim \
|
||||
&& msgr ok "Linked nvim and astronvim"
|
||||
if $0 install mise; then
|
||||
msgr ok "Installed packages"
|
||||
else
|
||||
msgr err "Failed to install mise tools"
|
||||
exit 1
|
||||
fi
|
||||
msgr run_done "nvim reset!"
|
||||
;;
|
||||
|
||||
@@ -593,8 +579,8 @@ section_dotfiles()
|
||||
--language-dialect bash \
|
||||
--func-next-line --list --write \
|
||||
--indent 2 --case-indent --space-redirects \
|
||||
--binary-next-line {} \;
|
||||
msgr yay "dotfiles have been shfmt formatted!"
|
||||
--binary-next-line {} \; \
|
||||
&& msgr yay "dotfiles have been shfmt formatted!"
|
||||
;;
|
||||
|
||||
*) menu_builder "$USAGE_PREFIX" "${MENU[@]}" ;;
|
||||
|
||||
20
scripts/cleanup-old-version-managers.md
Normal file
20
scripts/cleanup-old-version-managers.md
Normal file
@@ -0,0 +1,20 @@
|
||||
# cleanup-old-version-managers
|
||||
|
||||
Remove old version manager installations that have been replaced by mise.
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
scripts/cleanup-old-version-managers.sh [--dry-run]
|
||||
```
|
||||
|
||||
## What it does
|
||||
|
||||
1. Removes data directories for nvm, fnm, pyenv, goenv, and bob-nvim.
|
||||
2. Removes cargo-installed tool binaries now managed by mise.
|
||||
3. Removes go-installed tool binaries from `$GOPATH/bin`.
|
||||
4. Uninstalls Homebrew packages replaced by mise (if brew is available).
|
||||
|
||||
Mason binaries (`$XDG_DATA_HOME/nvim/mason/`) are not touched.
|
||||
|
||||
Pass `--dry-run` to preview what would be removed without making changes.
|
||||
139
scripts/cleanup-old-version-managers.sh
Executable file
139
scripts/cleanup-old-version-managers.sh
Executable file
@@ -0,0 +1,139 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
# @description Remove old version manager installations replaced by mise.
|
||||
# This script targets specific known directories — NOT which/command -v,
|
||||
# because nvim's Mason installs some of the same tool names.
|
||||
#
|
||||
# Ensure DOTFILES is set even when script is invoked directly
|
||||
if [[ -z "${DOTFILES:-}" ]]; then
|
||||
DOTFILES="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
export DOTFILES
|
||||
fi
|
||||
# shellcheck source=shared.sh
|
||||
source "$DOTFILES/config/shared.sh"
|
||||
|
||||
DRY_RUN=""
|
||||
if [[ $# -gt 0 ]]; then
|
||||
if [[ "$1" = "--dry-run" ]]; then
|
||||
DRY_RUN="--dry-run"
|
||||
else
|
||||
echo "Usage: $0 [--dry-run]" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
remove_dir()
|
||||
{
|
||||
local dir="$1"
|
||||
local label="$2"
|
||||
if [[ -d "$dir" ]]; then
|
||||
if [[ "$DRY_RUN" = "--dry-run" ]]; then
|
||||
msgr warn "[DRY RUN] Would remove $label: $dir"
|
||||
else
|
||||
msgr run "Removing $label: $dir"
|
||||
rm -rf "$dir"
|
||||
msgr run_done "Removed $label"
|
||||
fi
|
||||
else
|
||||
msgr ok "$label not found (already clean): $dir"
|
||||
fi
|
||||
}
|
||||
|
||||
remove_file()
|
||||
{
|
||||
local file="$1"
|
||||
local label="$2"
|
||||
if [[ -f "$file" ]]; then
|
||||
if [[ "$DRY_RUN" = "--dry-run" ]]; then
|
||||
msgr warn "[DRY RUN] Would remove $label: $file"
|
||||
else
|
||||
rm -f "$file"
|
||||
msgr run_done "Removed $label: $file"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
msgr msg "Cleaning up old version manager installations..."
|
||||
msgr msg "Mason binaries in \$XDG_DATA_HOME/nvim/mason/ will NOT be touched."
|
||||
|
||||
# --- Version manager data directories ---
|
||||
|
||||
# nvm (Node Version Manager)
|
||||
remove_dir "$XDG_DATA_HOME/nvm" "nvm data"
|
||||
|
||||
# fnm (Fast Node Manager)
|
||||
remove_dir "$XDG_DATA_HOME/fnm" "fnm data"
|
||||
|
||||
# pyenv
|
||||
remove_dir "$XDG_DATA_HOME/pyenv" "pyenv data"
|
||||
|
||||
# goenv
|
||||
remove_dir "$XDG_DATA_HOME/goenv" "goenv data"
|
||||
|
||||
# bob-nvim (neovim version manager — mise manages neovim now)
|
||||
remove_dir "$XDG_DATA_HOME/bob" "bob-nvim data"
|
||||
|
||||
# --- Cargo-installed tool binaries ---
|
||||
# These were installed via `cargo install` into $CARGO_HOME/bin.
|
||||
# mise now manages them via ubi/cargo backends into its own install dirs.
|
||||
# Only remove from the OLD cargo bin location, not from XDG_BIN_HOME.
|
||||
|
||||
CARGO_BIN="${XDG_DATA_HOME}/cargo/bin"
|
||||
CARGO_MANAGED_TOOLS=(
|
||||
bkt btm difft eza fd rg
|
||||
tree-sitter tmux-sessionizer zoxide bob
|
||||
cargo-install-update cargo-cache
|
||||
)
|
||||
for tool in "${CARGO_MANAGED_TOOLS[@]}"; do
|
||||
remove_file "$CARGO_BIN/$tool" "cargo-installed $tool"
|
||||
done
|
||||
|
||||
# --- Go-installed tool binaries ---
|
||||
# go install puts binaries in $GOBIN (= $XDG_BIN_HOME) or $GOPATH/bin.
|
||||
# Only remove from $GOPATH/bin if it differs from XDG_BIN_HOME.
|
||||
GO_BIN="${XDG_DATA_HOME}/go/bin"
|
||||
GO_MANAGED_TOOLS=(
|
||||
yamlfmt cheat glow fzf gum sesh git-profile
|
||||
)
|
||||
if [[ "$GO_BIN" != "$XDG_BIN_HOME" ]] && [[ -d "$GO_BIN" ]]; then
|
||||
for tool in "${GO_MANAGED_TOOLS[@]}"; do
|
||||
remove_file "$GO_BIN/$tool" "go-installed $tool"
|
||||
done
|
||||
fi
|
||||
|
||||
# --- npm global binaries ---
|
||||
# These were installed via `npm install -g` into the nvm/fnm node prefix.
|
||||
# Since we removed nvm/fnm data dirs above, these are already gone.
|
||||
|
||||
# --- Python tools via uv tool ---
|
||||
# uv tool binaries go to ~/.local/bin/ (XDG_BIN_HOME).
|
||||
# mise pipx backend installs to a different location.
|
||||
# We leave XDG_BIN_HOME alone and let mise take precedence via PATH.
|
||||
|
||||
# --- Homebrew-installed version managers ---
|
||||
# These will be removed when `brew bundle cleanup` runs after Brewfile update.
|
||||
if command -v brew &> /dev/null; then
|
||||
BREW_REMOVE=(
|
||||
pyenv pyenv-pip-migrate pyenv-virtualenv goenv cargo-binstall
|
||||
act age ansible ansible-lint awscli bat bats-core checkov
|
||||
choose-rust cmake gdu gh grype jq onefetch pinact shellcheck
|
||||
tfenv tflint tfsec uv virtualenv wakatime-cli
|
||||
)
|
||||
for pkg in "${BREW_REMOVE[@]}"; do
|
||||
if brew list "$pkg" &> /dev/null; then
|
||||
if [[ "$DRY_RUN" = "--dry-run" ]]; then
|
||||
msgr warn "[DRY RUN] Would brew uninstall $pkg"
|
||||
else
|
||||
msgr run "Uninstalling brew package: $pkg"
|
||||
msgr warn "Note: $pkg may have dependents"
|
||||
if brew uninstall "$pkg"; then
|
||||
msgr run_done "Uninstalled $pkg"
|
||||
else
|
||||
msgr err "Failed to uninstall $pkg"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
msgr yay "Cleanup complete! Run 'mise install' to set up tools via mise."
|
||||
@@ -1,21 +0,0 @@
|
||||
# install-cargo-packages
|
||||
|
||||
Install Rust packages defined in the script.
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
scripts/install-cargo-packages.sh
|
||||
```
|
||||
|
||||
## What it does
|
||||
|
||||
1. If `cargo-install-update` is available, updates all existing packages first
|
||||
and tracks which packages are already installed.
|
||||
2. Installs each package from the inline list using `cargo install`,
|
||||
skipping any already handled by the update step.
|
||||
Builds run in parallel using available CPU cores (minus two).
|
||||
3. Runs package-specific post-install steps.
|
||||
4. Cleans the cargo cache with `cargo cache --autoclean`.
|
||||
|
||||
To add or remove packages, edit the `packages` array in `scripts/install-cargo-packages.sh`.
|
||||
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -uo pipefail
|
||||
# @description Install cargo/rust packages.
|
||||
#
|
||||
# shellcheck source=shared.sh
|
||||
source "$DOTFILES/config/shared.sh"
|
||||
|
||||
msgr run "Starting to install rust/cargo packages"
|
||||
|
||||
# Track packages already managed by cargo install-update
|
||||
declare -A installed_packages
|
||||
|
||||
# If we have cargo install-update, use it first
|
||||
if command -v cargo-install-update &> /dev/null; then
|
||||
msgr run "Updating cargo packages with cargo install-update"
|
||||
# Show output in real-time (via stderr) while capturing it for parsing
|
||||
update_output=$(cargo install-update -a 2>&1 | tee /dev/stderr)
|
||||
msgr run_done "Done with cargo install-update"
|
||||
|
||||
# Parse installed package names from the update output
|
||||
while IFS= read -r pkg_name; do
|
||||
[[ -n "$pkg_name" ]] && installed_packages["$pkg_name"]=1
|
||||
done < <(echo "$update_output" | awk '/v[0-9]+\.[0-9]+/ { print $1 }')
|
||||
fi
|
||||
|
||||
# Cargo packages to install
|
||||
packages=(
|
||||
cargo-update # A cargo subcommand for checking and applying updates to installed executables
|
||||
cargo-cache # Cargo cache management utility
|
||||
tree-sitter-cli # An incremental parsing system for programming tools
|
||||
bkt # A subprocess caching utility
|
||||
difftastic # A structural diff that understands syntax
|
||||
fd-find # A simple, fast and user-friendly alternative to 'find'
|
||||
ripgrep # Recursively searches directories for a regex pattern while respecting your gitignore
|
||||
bob-nvim # A version manager for neovim
|
||||
bottom # A cross-platform graphical process/system monitor
|
||||
eza # A modern alternative to ls
|
||||
tmux-sessionizer # A tool for opening git repositories as tmux sessions
|
||||
zoxide # A smarter cd command
|
||||
)
|
||||
|
||||
# Number of jobs to run in parallel, this helps to keep the system responsive
|
||||
BUILD_JOBS=$(nproc --ignore=2 2> /dev/null || sysctl -n hw.ncpu 2> /dev/null || echo 1)
|
||||
|
||||
# Function to install cargo packages
|
||||
install_packages()
|
||||
{
|
||||
for pkg in "${packages[@]}"; do
|
||||
# Skip packages already handled by cargo install-update
|
||||
if [[ -n "${installed_packages[$pkg]+x}" ]]; then
|
||||
msgr ok "Skipping $pkg (already installed)"
|
||||
continue
|
||||
fi
|
||||
|
||||
msgr run "Installing cargo package $pkg"
|
||||
cargo install --jobs "$BUILD_JOBS" "$pkg"
|
||||
msgr run_done "Done installing $pkg"
|
||||
echo ""
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to perform additional steps for installed cargo packages
|
||||
post_install_steps()
|
||||
{
|
||||
msgr run "Now doing the next steps for cargo packages"
|
||||
|
||||
# use bob to install latest stable nvim
|
||||
if command -v bob &> /dev/null; then
|
||||
bob use stable && x-path-append "$XDG_DATA_HOME/bob/nvim-bin"
|
||||
fi
|
||||
|
||||
msgr run "Removing cargo cache"
|
||||
cargo cache --autoclean
|
||||
msgr "done" "Done removing cargo cache"
|
||||
return 0
|
||||
}
|
||||
|
||||
# Install cargo packages and run post-install steps
|
||||
main()
|
||||
{
|
||||
install_packages
|
||||
msgr "done" "Installed cargo packages!"
|
||||
post_install_steps
|
||||
return 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
@@ -51,8 +51,9 @@ install_fonts()
|
||||
{
|
||||
msgr run "Starting to install NerdFonts..."
|
||||
# shellcheck disable=SC2048,SC2086
|
||||
./install.sh -q -s ${fonts[*]}
|
||||
msgr run_done "Done"
|
||||
# shellcheck disable=SC2086
|
||||
./install.sh -q -s ${fonts[*]} \
|
||||
&& msgr run_done "Done"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@ install_extensions()
|
||||
# Install all GitHub CLI extensions
|
||||
main()
|
||||
{
|
||||
install_extensions
|
||||
msgr run_done "Done"
|
||||
install_extensions \
|
||||
&& msgr run_done "Done"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
# install-go-packages
|
||||
|
||||
Install Go packages defined in the script.
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
scripts/install-go-packages.sh
|
||||
```
|
||||
|
||||
## What it does
|
||||
|
||||
1. Checks that `go` is available.
|
||||
2. Installs each package from the inline list using `go install`.
|
||||
3. Runs post-install steps (e.g. generating shell completions).
|
||||
4. Clears the Go module and build caches.
|
||||
|
||||
To add or remove packages, edit the `packages` array in `scripts/install-go-packages.sh`.
|
||||
@@ -1,69 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
# @description Install Go packages
|
||||
#
|
||||
# shellcheck source=shared.sh
|
||||
source "$DOTFILES/config/shared.sh"
|
||||
|
||||
msgr run "Installing go packages"
|
||||
|
||||
! x-have "go" && msgr err "go hasn't been installed yet." && exit 0
|
||||
|
||||
# Go packages to install
|
||||
packages=(
|
||||
github.com/dotzero/git-profile@latest # Switch between git user profiles
|
||||
github.com/google/yamlfmt/cmd/yamlfmt@latest # Format yaml files
|
||||
github.com/cheat/cheat/cmd/cheat@latest # Interactive cheatsheets on the CLI
|
||||
github.com/charmbracelet/glow@latest # Render markdown on the CLI
|
||||
github.com/junegunn/fzf@latest # General-purpose fuzzy finder
|
||||
github.com/charmbracelet/gum@latest # Glamorous shell scripts
|
||||
github.com/joshmedeski/sesh/v2@latest # Terminal session manager
|
||||
)
|
||||
|
||||
# Function to install go packages
|
||||
install_packages()
|
||||
{
|
||||
for pkg in "${packages[@]}"; do
|
||||
# Strip inline comments and trim whitespace
|
||||
pkg="${pkg%%#*}"
|
||||
pkg="${pkg// /}"
|
||||
[[ -z "$pkg" ]] && continue
|
||||
|
||||
msgr nested "Installing go package: $pkg"
|
||||
go install "$pkg"
|
||||
echo ""
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to install completions and run actions for selected packages
|
||||
post_install()
|
||||
{
|
||||
msgr run "Installing completions for selected packages"
|
||||
|
||||
if command -v git-profile &> /dev/null; then
|
||||
git-profile completion zsh > "$ZSH_CUSTOM_COMPLETION_PATH/_git-profile" \
|
||||
&& msgr run_done "Installed completions for git-profile"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to clear go cache
|
||||
clear_go_cache()
|
||||
{
|
||||
msgr run "Clearing go cache"
|
||||
go clean -cache -modcache
|
||||
return 0
|
||||
}
|
||||
|
||||
# Install go packages, completions, and clear cache
|
||||
main()
|
||||
{
|
||||
install_packages
|
||||
post_install
|
||||
clear_go_cache
|
||||
msgr run_done "Done"
|
||||
return 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
@@ -1,18 +0,0 @@
|
||||
# install-npm-packages
|
||||
|
||||
Install npm packages defined in the script.
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
scripts/install-npm-packages.sh
|
||||
```
|
||||
|
||||
## What it does
|
||||
|
||||
1. Checks that `npm` is available.
|
||||
2. Installs each package from the inline list using `npm install -g`.
|
||||
3. Upgrades all global packages.
|
||||
4. Cleans the npm cache.
|
||||
|
||||
To add or remove packages, edit the `packages` array in `scripts/install-npm-packages.sh`.
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
# @description Install npm packages globally.
|
||||
#
|
||||
# shellcheck source=shared.sh
|
||||
source "$DOTFILES/config/shared.sh"
|
||||
|
||||
msgr msg "Starting to install npm packages"
|
||||
|
||||
if ! command -v npm &> /dev/null; then
|
||||
msgr err "npm could not be found."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
packages=(
|
||||
editorconfig-checker # Check files against .editorconfig rules
|
||||
github-release-notes # Create release notes from tags and issues
|
||||
neovim # Neovim node client
|
||||
corepack # Node.js package manager version management
|
||||
)
|
||||
|
||||
# Function to install npm packages
|
||||
install_packages()
|
||||
{
|
||||
for pkg in "${packages[@]}"; do
|
||||
# Strip inline comments and trim whitespace
|
||||
pkg="${pkg%%#*}"
|
||||
pkg="${pkg// /}"
|
||||
[[ -z "$pkg" ]] && continue
|
||||
|
||||
if npm ls -g -p "$pkg" &> /dev/null; then
|
||||
msgr run_done "$pkg" "already installed"
|
||||
else
|
||||
msgr run "Installing npm package:" "$pkg"
|
||||
npm install -g --no-fund --no-progress --no-timing "$pkg"
|
||||
fi
|
||||
echo ""
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to upgrade all global npm packages
|
||||
upgrade_global_packages()
|
||||
{
|
||||
msgr run "Upgrading all global packages"
|
||||
npm -g --no-progress --no-timing --no-fund outdated || true
|
||||
npm -g --no-timing --no-fund upgrade
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to clean npm cache
|
||||
clean_npm_cache()
|
||||
{
|
||||
msgr run "Cleaning up npm cache"
|
||||
npm cache verify
|
||||
npm cache clean --force
|
||||
npm cache verify
|
||||
return 0
|
||||
}
|
||||
|
||||
# Install, upgrade, and clean npm packages
|
||||
main()
|
||||
{
|
||||
install_packages
|
||||
upgrade_global_packages
|
||||
clean_npm_cache
|
||||
msgr yay "npm package installations complete"
|
||||
return 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
@@ -1,6 +1,6 @@
|
||||
# install-python-packages
|
||||
|
||||
Install Python packages defined in the script using `uv`.
|
||||
Install Python **libraries** (not tools — those are managed by mise).
|
||||
|
||||
## Usage
|
||||
|
||||
@@ -10,9 +10,7 @@ scripts/install-python-packages.sh
|
||||
|
||||
## What it does
|
||||
|
||||
1. Checks that `uv` is available; if missing, installs it via the official installer.
|
||||
2. Installs each CLI tool from the inline `tools` array using `uv tool install --upgrade`.
|
||||
3. Installs each library from the inline `libraries` array using `uv pip install --system --upgrade`.
|
||||
4. Upgrades all uv-managed tools with `uv tool upgrade --all`.
|
||||
1. Checks that `uv` is available; if missing, exits with an error (install `uv` via mise first).
|
||||
2. Installs each library from the inline `libraries` array using `uv pip install --system --upgrade`.
|
||||
|
||||
To add or remove packages, edit the `tools` or `libraries` arrays in `scripts/install-python-packages.sh`.
|
||||
To add or remove packages, edit the `libraries` array in `scripts/install-python-packages.sh`.
|
||||
|
||||
@@ -1,53 +1,27 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
# @description Install Python packages using uv.
|
||||
# @description Install Python libraries via uv pip (tools are managed by mise).
|
||||
#
|
||||
# shellcheck source=shared.sh
|
||||
source "$DOTFILES/config/shared.sh"
|
||||
|
||||
msgr run "Starting to install Python packages"
|
||||
msgr run "Starting to install Python libraries"
|
||||
|
||||
# Ensure uv is available
|
||||
if ! command -v uv &> /dev/null; then
|
||||
msgr nested "uv not found, installing via official installer"
|
||||
curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
msgr err "uv not found — install it via mise first"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# CLI tools — installed isolated with `uv tool install`
|
||||
tools=(
|
||||
ansible # IT automation and configuration management
|
||||
openapi-python-client # Generate Python API clients from OpenAPI specs
|
||||
ruff # Fast Python linter and formatter
|
||||
)
|
||||
|
||||
# Library packages — installed into system Python with `uv pip install --system`
|
||||
libraries=(
|
||||
libtmux # Python API for tmux
|
||||
pynvim # Neovim Python client
|
||||
)
|
||||
|
||||
# Function to install CLI tools via uv tool install
|
||||
install_tools()
|
||||
{
|
||||
msgr run "Installing Python CLI tools"
|
||||
for pkg in "${tools[@]}"; do
|
||||
# Strip inline comments and trim whitespace
|
||||
pkg="${pkg%%#*}"
|
||||
pkg="${pkg// /}"
|
||||
[[ -z "$pkg" ]] && continue
|
||||
|
||||
msgr nested "Installing tool: $pkg"
|
||||
uv tool install --upgrade "$pkg"
|
||||
echo ""
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to install library packages via uv pip install
|
||||
install_libraries()
|
||||
{
|
||||
msgr run "Installing Python libraries"
|
||||
for pkg in "${libraries[@]}"; do
|
||||
# Strip inline comments and trim whitespace
|
||||
pkg="${pkg%%#*}"
|
||||
@@ -61,22 +35,5 @@ install_libraries()
|
||||
return 0
|
||||
}
|
||||
|
||||
# Function to upgrade all uv-managed tools
|
||||
upgrade_tools()
|
||||
{
|
||||
msgr run "Upgrading all uv-managed tools"
|
||||
uv tool upgrade --all
|
||||
return 0
|
||||
}
|
||||
|
||||
# Install Python tools, libraries, and upgrade all
|
||||
main()
|
||||
{
|
||||
install_tools
|
||||
install_libraries
|
||||
upgrade_tools
|
||||
msgr yay "Python package installations complete"
|
||||
return 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
install_libraries \
|
||||
&& msgr yay "Python library installations complete"
|
||||
|
||||
@@ -23,8 +23,8 @@ install_shellspec()
|
||||
fi
|
||||
|
||||
msgr run "Running make install..."
|
||||
make -C "$SHELLSPEC_CACHE" install PREFIX="$HOME/.local"
|
||||
msgr run_done "shellspec $version installed to $HOME/.local/bin/shellspec"
|
||||
make -C "$SHELLSPEC_CACHE" install PREFIX="$HOME/.local" \
|
||||
&& msgr run_done "shellspec $version installed to $HOME/.local/bin/shellspec"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ clone_z_repo()
|
||||
local bin_path=$2
|
||||
|
||||
if [[ ! -d "$bin_path" ]]; then
|
||||
git clone "$git_path" "$bin_path"
|
||||
msgr run_done "z installed at $bin_path"
|
||||
git clone "$git_path" "$bin_path" \
|
||||
&& msgr run_done "z installed at $bin_path"
|
||||
else
|
||||
msgr ok "z ($bin_path/) already installed"
|
||||
fi
|
||||
|
||||
82
yarn.lock
82
yarn.lock
@@ -6,17 +6,17 @@ __metadata:
|
||||
cacheKey: 10c0
|
||||
|
||||
"@biomejs/biome@npm:^2.4.4":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/biome@npm:2.4.6"
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/biome@npm:2.4.7"
|
||||
dependencies:
|
||||
"@biomejs/cli-darwin-arm64": "npm:2.4.6"
|
||||
"@biomejs/cli-darwin-x64": "npm:2.4.6"
|
||||
"@biomejs/cli-linux-arm64": "npm:2.4.6"
|
||||
"@biomejs/cli-linux-arm64-musl": "npm:2.4.6"
|
||||
"@biomejs/cli-linux-x64": "npm:2.4.6"
|
||||
"@biomejs/cli-linux-x64-musl": "npm:2.4.6"
|
||||
"@biomejs/cli-win32-arm64": "npm:2.4.6"
|
||||
"@biomejs/cli-win32-x64": "npm:2.4.6"
|
||||
"@biomejs/cli-darwin-arm64": "npm:2.4.7"
|
||||
"@biomejs/cli-darwin-x64": "npm:2.4.7"
|
||||
"@biomejs/cli-linux-arm64": "npm:2.4.7"
|
||||
"@biomejs/cli-linux-arm64-musl": "npm:2.4.7"
|
||||
"@biomejs/cli-linux-x64": "npm:2.4.7"
|
||||
"@biomejs/cli-linux-x64-musl": "npm:2.4.7"
|
||||
"@biomejs/cli-win32-arm64": "npm:2.4.7"
|
||||
"@biomejs/cli-win32-x64": "npm:2.4.7"
|
||||
dependenciesMeta:
|
||||
"@biomejs/cli-darwin-arm64":
|
||||
optional: true
|
||||
@@ -36,72 +36,72 @@ __metadata:
|
||||
optional: true
|
||||
bin:
|
||||
biome: bin/biome
|
||||
checksum: 10c0/3c0aea8069fa4bebde97ff4ef394f0383d2a3a1393a99e0cdea6c1769805cc18c5ea2c02e88779a63327d432c5858522dceae32f6a359d690f5f71f60ea4ca02
|
||||
checksum: 10c0/c073da6f081b72e061e471f6bc6d8680978dceb84a3528cb58117466d38ecb7cef075d949875d2371a268af030c2afece0fb6dd593d124fc8706c9307909f244
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-darwin-arm64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-darwin-arm64@npm:2.4.6"
|
||||
"@biomejs/cli-darwin-arm64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-darwin-arm64@npm:2.4.7"
|
||||
conditions: os=darwin & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-darwin-x64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-darwin-x64@npm:2.4.6"
|
||||
"@biomejs/cli-darwin-x64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-darwin-x64@npm:2.4.7"
|
||||
conditions: os=darwin & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-linux-arm64-musl@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.4.6"
|
||||
"@biomejs/cli-linux-arm64-musl@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-linux-arm64-musl@npm:2.4.7"
|
||||
conditions: os=linux & cpu=arm64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-linux-arm64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-linux-arm64@npm:2.4.6"
|
||||
"@biomejs/cli-linux-arm64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-linux-arm64@npm:2.4.7"
|
||||
conditions: os=linux & cpu=arm64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-linux-x64-musl@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-linux-x64-musl@npm:2.4.6"
|
||||
"@biomejs/cli-linux-x64-musl@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-linux-x64-musl@npm:2.4.7"
|
||||
conditions: os=linux & cpu=x64 & libc=musl
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-linux-x64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-linux-x64@npm:2.4.6"
|
||||
"@biomejs/cli-linux-x64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-linux-x64@npm:2.4.7"
|
||||
conditions: os=linux & cpu=x64 & libc=glibc
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-win32-arm64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-win32-arm64@npm:2.4.6"
|
||||
"@biomejs/cli-win32-arm64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-win32-arm64@npm:2.4.7"
|
||||
conditions: os=win32 & cpu=arm64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@biomejs/cli-win32-x64@npm:2.4.6":
|
||||
version: 2.4.6
|
||||
resolution: "@biomejs/cli-win32-x64@npm:2.4.6"
|
||||
"@biomejs/cli-win32-x64@npm:2.4.7":
|
||||
version: 2.4.7
|
||||
resolution: "@biomejs/cli-win32-x64@npm:2.4.7"
|
||||
conditions: os=win32 & cpu=x64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/node@npm:^25.3.2":
|
||||
version: 25.3.3
|
||||
resolution: "@types/node@npm:25.3.3"
|
||||
version: 25.5.0
|
||||
resolution: "@types/node@npm:25.5.0"
|
||||
dependencies:
|
||||
undici-types: "npm:~7.18.0"
|
||||
checksum: 10c0/63e1d3816a9f4a706ab5d588d18cb98aa824b97748ff585537d327528e9438f58f69f45c7762e7cd3a1ab32c1619f551aabe8075d13172f9273cf10f6d83ab91
|
||||
checksum: 10c0/70c508165b6758c4f88d4f91abca526c3985eee1985503d4c2bd994dbaf588e52ac57e571160f18f117d76e963570ac82bd20e743c18987e82564312b3b62119
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -240,9 +240,9 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"lru-cache@npm:^11.0.0":
|
||||
version: 11.2.6
|
||||
resolution: "lru-cache@npm:11.2.6"
|
||||
checksum: 10c0/73bbffb298760e71b2bfe8ebc16a311c6a60ceddbba919cfedfd8635c2d125fbfb5a39b71818200e67973b11f8d59c5a9e31d6f90722e340e90393663a66e5cd
|
||||
version: 11.2.7
|
||||
resolution: "lru-cache@npm:11.2.7"
|
||||
checksum: 10c0/549cdb59488baa617135fc12159cafb1a97f91079f35093bb3bcad72e849fc64ace636d244212c181dfdf1a99bbfa90757ff303f98561958ee4d0f885d9bd5f7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Reference in New Issue
Block a user