Merge branch 'chezmoi' into trunk

Author: macintacos

.chezmoiroot

@@ -0,0 +1 @@
+managed

.gitignore

@@ -1,38 +1,39 @@
+# Fish
+**/fishd.tmp*
+fish_variables
+shell/fish/**/secret
+shell/fish/completions/
+shell/fish/conf.d/
+shell/fish/fish_variables
+shell/fish/functions/
+shell/fish/user/env/env.s.fish
+
+# VSCode
 .vscode/*
+!.vscode/extensions.json
+!.vscode/launch.json
 !.vscode/settings.json
 !.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-npm/npm-backup-current.txt.*
 
+# Random Files
+!k9s/skin.yaml
+**/__pycache__
+**/build
+**/dist
+**/secrets
+**/sshndp*
+**/venv
 **/zsh/**/*.zwc*
 **/zsh/.zcompdump*
 **/zsh/.zinit/
 **/zsh/.zsh_history
 **/zsh/.zsh_sessions
 .DS_STORE
-/nvim/.netrwhist
 /backup/Brewfile.lock.json
+/nvim/.netrwhist
 /setup/setup.log
-tags
-**/sshndp*
-**/__pycache__
-
-# Fish
-shell/fish/fish_variables
-fish_variables
-**/fishd.tmp*
-shell/fish/**/secret
-shell/fish/user/env/env.s.fish
-shell/fish/completions/
-shell/fish/functions/
-shell/fish/conf.d/
-
-# Random Files
-**/dist
-**/build
-**/venv
-**/secrets
-node_modules
 k9s/*
-!k9s/skin.yaml
+node_modules
+npm/npm-backup-current.txt.*
+tags
+project.logs

.taplo.toml

@@ -0,0 +1,6 @@
+# https://taplo.tamasfe.dev/configuration/formatter-options.html
+[formatting]
+align_entries = true
+column_width  = 88
+indent_string = "  "
+reorder_keys  = true

.vscode/settings.json

@@ -1,29 +1,5 @@
 {
-  "[shellscript]": {
-    "editor.formatOnSave": false
-  },
-  "explorerExclude.backup": null,
-  "files.exclude": {
-    "**/*.zwc*": true,
-    "**/.DS_Store": true,
-    "**/.classpath": true,
-    "**/.factorypath": true,
-    "**/.git": true,
-    "**/.hg": true,
-    "**/.project": true,
-    "**/.settings": true,
-    "**/.svn": true,
-    "**/.zcompdump": true,
-    "**/.zsh_history": true,
-    "**/CVS": true,
-    "**/Thumbs.db": true,
-    "**/zsh/.zinit": false
-  },
-  "python.formatting.blackPath": "/Users/macinburrito/.local/bin/black",
-  "search.exclude": {
-    "**/*.code-search": true,
-    "**/bower_components": true,
-    "**/node_modules": true,
-    "**/zsh/.zinit": true
+  "files.associations": {
+    "*.tmpl": "gotemplate"
   }
 }

README.md

@@ -1,32 +1,15 @@
-# dotfiles
-
-[![Actions Status](https://github.com/macintacos/dotfiles/workflows/CI/badge.svg)](https://github.com/macintacos/dotfiles/actions)
+# • files
 
 As is the trend, I am joining [many others](https://dotfiles.github.io/) in the programmer's natural fascination with dotfiles; how they're set up, what new toys are hidden in their obscure references, and how much time we can waste putting them all together. My dotfiles are shameful, but they're mine.
 
-All PRs will be considered, but ultimately ignored. If you decide to use them, I'm not responsible for what they do to your productivity.
-
-## Setup
-
-Run `just` to see available recipes:
-
-```bash
-$ just
-Available recipes:
-    install
-    install-ci
-    hooks      # Set up git hooks so that things are committed the way we want
-    symlink    # Symlink files
-    backup     # Backup packages, casks, and plugins
-    sort       # Sort keybindings (and eventually other things)
-```
+All PRs will be considered, but ultimately ignored. If you decide to use this project, I'm not responsible for what they do to your productivity.
 
-## Whatcha got?
+## Disclaimer - Migration in Progress
 
-Installing this stuff will get you the following:
+I recently switched to using [`chezmoi`](https://github.com/twpayne/chezmoi) to manage this mess. I find that it "fits my brain" really well, and I think I'm going to be sticking with it for the long-haul. I haven't _quite_ gotten to the point yet where everything is managed with it, but it's getting there. Once it's done, I'll be making this the main branch, so until then consider this whole project a work in progress that could change at any time.
 
-- A [Fish configuration](./shell/fish/README.md) that I'm pretty fond of (and am currently using).
-- A [ZSH configuration](./shell/zsh/README.md) that I'm pretty fond of (and am not currently using).
-- All of the tools/casks that I use on the daily (check out the [Brewfile](./backup/Brewfile), there's a lot of them)
+Basic layout:
 
-I used to keep my neovim configuration here, but I decided to just keep it to its own repo: https://github.com/macintacos/nvim
+- `managed` - everything managed by `chezmoi` directly is being put in here. This is where the vast majority of files are located.
+- `extra` - everything not managed by `chezmoi` is being put in here. Technically, this should only be for files that can technically be "anywhere" on the system - ideally there's nothing here, but sometimes things will live here until I find a good home for them.
+- `scripts` - this is for scripts that are called by `chezmoi` itself, _not_ for scripts that would be called by the configurations that are being managed here. Scripts like that should just live somewhere in the configuration for said tool.

backup/Brewfile

@@ -11,6 +11,7 @@ tap "drone/drone"
 tap "eddieantonio/eddieantonio"
 tap "espanso/espanso"
 tap "eth-p/software"
+tap "felixkratz/formulae"
 tap "finestructure/hummingbird"
 tap "github/gh"
 tap "go-swagger/go-swagger"
@@ -38,6 +39,7 @@ tap "mongodb/brew"
 tap "ms-jpq/sad"
 tap "muesli/tap"
 tap "ngrok/ngrok"
+tap "nikitabobko/tap"
 tap "nshipster/formulae"
 tap "nvie/tap"
 tap "oktadeveloper/tap"
@@ -77,8 +79,8 @@ brew "brew-gem"
 brew "broot"
 brew "btop"
 brew "fontconfig"
-brew "gettext"
 brew "libunistring"
+brew "gettext"
 brew "glib"
 brew "cairo"
 brew "gmp"
@@ -120,7 +122,6 @@ brew "fb303"
 brew "edencommon"
 brew "wxwidgets"
 brew "erlang"
-brew "[email protected]"
 brew "expect"
 brew "eza"
 brew "fd"
@@ -151,6 +152,7 @@ brew "open-mpi"
 brew "fftw"
 brew "findutils"
 brew "fish"
+brew "[email protected]"
 brew "[email protected]"
 brew "fontforge"
 brew "fswatch"
@@ -182,11 +184,12 @@ brew "gping"
 brew "grep"
 brew "grepcidr"
 brew "hadolint"
-brew "pkg-config"
+brew "pkgconf"
 brew "hdf5"
 brew "helix"
 brew "helm"
 brew "helm@2"
+brew "hexyl"
 brew "httpie"
 brew "hyperfine"
 brew "libheif"
@@ -208,6 +211,7 @@ brew "luarocks"
 brew "make"
 brew "marksman"
 brew "mas"
+brew "mdcat"
 brew "mercurial"
 brew "protobuf"
 brew "mitmproxy"
@@ -251,11 +255,13 @@ brew "sdl12-compat"
 brew "sdl_image"
 brew "sdl_mixer"
 brew "sdl_ttf"
+brew "sevenzip"
 brew "shellcheck"
 brew "shfmt"
 brew "subversion"
 brew "tailscale"
 brew "taplo"
+brew "television"
 brew "terminal-notifier"
 brew "tflint"
 brew "tlrc"
@@ -269,6 +275,7 @@ brew "virtualenv"
 brew "watchexec"
 brew "watchman"
 brew "wget"
+brew "yazi"
 brew "yq"
 brew "zellij"
 brew "zip"
@@ -279,12 +286,14 @@ brew "charmbracelet/tap/gum"
 brew "derailed/k9s/k9s"
 brew "drone/drone/drone"
 brew "eddieantonio/eddieantonio/imgcat"
+brew "felixkratz/formulae/borders"
 brew "hashicorp/tap/terraform"
 brew "jesseduffield/lazygit/lazygit"
 brew "johanhaleby/kubetail/kubetail", args: ["with-short-names"]
 brew "ms-jpq/sad/sad"
 brew "nvie/tap/git-toolbelt"
 cask "1password-cli"
+cask "aerospace"
 cask "alfred"
 cask "alt-tab"
 cask "amethyst"
@@ -305,6 +314,7 @@ cask "fig"
 cask "firefox"
 cask "font-awesome-terminal-fonts"
 cask "font-fontawesome"
+cask "font-hack-nerd-font"
 cask "font-inconsolata-dz-for-powerline"
 cask "font-inconsolata-for-powerline"
 cask "font-inconsolata-g-for-powerline"
@@ -313,7 +323,9 @@ cask "font-jetbrains-mono"
 cask "font-roboto-mono"
 cask "font-roboto-mono-for-powerline"
 cask "font-source-code-pro"
+cask "font-symbols-only-nerd-font"
 cask "forklift"
+cask "ghostty"
 cask "git-credential-manager"
 cask "git-credential-manager"
 cask "google-cloud-sdk"
@@ -323,6 +335,7 @@ cask "hovrly"
 cask "hummingbird"
 cask "hyper"
 cask "iina"
+cask "inkscape"
 cask "istat-menus"
 cask "iterm2"
 cask "jetbrains-toolbox"
@@ -378,6 +391,8 @@ cask "xquartz"
 cask "yt-music"
 mas "1Password for Safari", id: 1569813296
 mas "Amphetamine", id: 937984704
+mas "Bear", id: 1091189122
+mas "Clocker", id: 1056643111
 mas "Copy 'Em", id: 876540291
 mas "Craft", id: 1487937127
 mas "Dark Reader for Safari", id: 1438243180
@@ -394,7 +409,6 @@ mas "Keynote", id: 409183694
 mas "Kindle Classic", id: 405399194
 mas "Mela", id: 1568924476
 mas "Mercury", id: 1621800675
-mas "NordVPN", id: 905953485
 mas "Okta Verify", id: 490179405
 mas "OmniFocus", id: 1542143627
 mas "Pandan", id: 1569600264
@@ -409,6 +423,7 @@ mas "Service Station", id: 1503136033
 mas "Tailscale", id: 1475387142
 mas "TestFlight", id: 899247664
 mas "Things", id: 904280696
+mas "Todoist", id: 585829637
 mas "ToothFairy", id: 1191449274
 mas "Tot", id: 1491071483
 mas "Userscripts-Mac-App", id: 1463298887
@@ -450,6 +465,7 @@ vscode "bradlc.vscode-tailwindcss"
 vscode "brunnerh.insert-unicode"
 vscode "budparr.language-hugo-vscode"
 vscode "cardinal90.multi-cursor-case-preserve"
+vscode "casualjim.gotemplate"
 vscode "catppuccin.catppuccin-vsc"
 vscode "ceciljacob.code-plus-theme"
 vscode "chadalen.vscode-jetbrains-icon-theme"
@@ -495,6 +511,7 @@ vscode "fabiospampinato.vscode-diff"
 vscode "fabiospampinato.vscode-git-history"
 vscode "fabiospampinato.vscode-open-in-github"
 vscode "file-icons.file-icons"
+vscode "fill-labs.dependi"
 vscode "firefox-devtools.vscode-firefox-debug"
 vscode "fknop.vscode-npm"
 vscode "formulahendry.auto-close-tag"
@@ -525,11 +542,13 @@ vscode "jacobdufault.fuzzy-search"
 vscode "jakob101.relativepath"
 vscode "janisdd.vscode-edit-csv"
 vscode "jannisx11.batch-rename-extension"
+vscode "jasonnutter.vscode-codeowners"
 vscode "jdinhlife.gruvbox"
 vscode "jeff-hykin.better-dockerfile-syntax"
 vscode "jgclark.vscode-todo-highlight"
 vscode "joaompinto.vscode-graphviz"
 vscode "johnnymorganz.stylua"
+vscode "jorcelinojunior.chezmoi-tools"
 vscode "joselitofilho.ginkgotestexplorer"
 vscode "julianiaquinandi.nvim-ui-modifier"
 vscode "jy-xlj.vscode-json-editor"
@@ -542,13 +561,13 @@ vscode "khaeransori.json2csv"
 vscode "kisstkondoros.vscode-gutter-preview"
 vscode "lacroixdavid1.vscode-format-context-menu"
 vscode "laurenttreguier.rpm-spec"
-vscode "lehni.vscode-fix-checksums"
 vscode "leizongmin.node-module-intellisense"
 vscode "letrieu.expand-region"
 vscode "littlefoxteam.vscode-python-test-adapter"
 vscode "liviuschera.noctis"
 vscode "loilo.snazzy-light"
 vscode "mads-hartmann.bash-ide-vscode"
+vscode "marp-team.marp-vscode"
 vscode "mattn.lisp"
 vscode "mdickin.markdown-shortcuts"
 vscode "mechatroner.rainbow-csv"
@@ -609,10 +628,12 @@ vscode "redhat.vscode-xml"
 vscode "redhat.vscode-yaml"
 vscode "remisa.shellman"
 vscode "richie5um2.vscode-sort-json"
+vscode "rimuruchan.vscode-fix-checksums-next"
 vscode "rogalmic.bash-debug"
 vscode "ronnidc.nunjucks"
 vscode "rust-lang.rust-analyzer"
 vscode "ryanraposo.codeui"
+vscode "ryu1kn.partial-diff"
 vscode "ryuta46.multi-command"
 vscode "samuelcolvin.jinjahtml"
 vscode "sandcastle.vscode-open"
@@ -630,6 +651,7 @@ vscode "stylelint.vscode-stylelint"
 vscode "sumneko.lua"
 vscode "svelte.svelte-vscode"
 vscode "svipas.control-snippets"
+vscode "swiftlang.swift-vscode"
 vscode "takumii.markdowntable"
 vscode "tamasfe.even-better-toml"
 vscode "telesoho.vscode-markdown-paste-image"
@@ -638,6 +660,7 @@ vscode "tfsec.tfsec"
 vscode "tilt-dev.tiltfile"
 vscode "timonwong.shellcheck"
 vscode "tintinweb.graphviz-interactive-preview"
+vscode "tompollak.lazygit-vscode"
 vscode "tonybaloney.vscode-pets"
 vscode "trixnz.go-to-method"
 vscode "trond-snekvik.simple-rst"