From 7cedaa233b0e6d7660fe1ff28836cffba257dae4 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Mon, 10 Nov 2025 15:18:32 -0600 Subject: [PATCH] Switch over to mise --- mise/.default-python-packages | 1 + mise/config.toml | 8 ++++++++ nvim/lazy-lock.json | 26 +++++++++++++------------- nvim/lua/config/settings.lua | 2 +- nvim/lua/plugins/41-autoformat.lua | 8 ++------ setup.sh | 2 +- zsh/zprofile | 11 +++++++++-- zsh/zshenv | 12 ++++++++++-- 8 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 mise/.default-python-packages create mode 100644 mise/config.toml diff --git a/mise/.default-python-packages b/mise/.default-python-packages new file mode 100644 index 0000000..02cadb4 --- /dev/null +++ b/mise/.default-python-packages @@ -0,0 +1 @@ +░ diff --git a/mise/config.toml b/mise/config.toml new file mode 100644 index 0000000..df49233 --- /dev/null +++ b/mise/config.toml @@ -0,0 +1,8 @@ +[tools] +node = "22" +ruby = "3" +python = "3" + +[tasks] +gcloud-login = "gcloud auth application-default login" +orm-setup = "python -m pip install keyring keyrings.google-artifactregistry-auth --index-url https://pypi.org/simple/ && python -m pip install orm-cli --index-url https://us-central1-python.pkg.dev/common-build/pypi/simple/" diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index d241905..f29ae38 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,37 +1,37 @@ { - "avante.nvim": { "branch": "main", "commit": "44db8eba870f6c123da5efa70384b2889f3e3495" }, + "avante.nvim": { "branch": "main", "commit": "56951378f10b25f8bb0f5bb516b8d778a1e498a7" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "catppuccin": { "branch": "main", "commit": "5af9374957a65be8770696da295dc9016b96f241" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, + "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, "dropbar.nvim": { "branch": "master", "commit": "3460930700ca67b4590a69ac3f1d65d5f9658fb6" }, - "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" }, - "gitsigns.nvim": { "branch": "main", "commit": "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343" }, + "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "0d7629a40e7f0e16d0853f7e164c549893af9405" }, - "neo-tree.nvim": { "branch": "main", "commit": "e10eed81d215a2c399228090070d6806217017e3" }, + "mini.nvim": { "branch": "main", "commit": "d12b7c1b4dccc5245a3d2b7bc73da6dd910af2c0" }, + "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-lspconfig": { "branch": "master", "commit": "336b388c272555d2ae94627a50df4c2f89a5e257" }, + "nvim-lspconfig": { "branch": "master", "commit": "bc09aa236d7d2af66f56a5a35d0577588eca7800" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-surround": { "branch": "main", "commit": "75de1782c781961e392efcca57601bf436f4d550" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "project-cli-commands.nvim": { "branch": "main", "commit": "9a2a2fdfd38a3d71cc927e3a398ac0ddfa846b3d" }, - "schemastore.nvim": { "branch": "main", "commit": "fea7b3eb30d6e7261529ae7e8e94bf717f9c428f" }, + "schemastore.nvim": { "branch": "main", "commit": "d522e3ed6ed2c7bed7ebe1e42615e79b3aabfe65" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, - "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/nvim/lua/config/settings.lua b/nvim/lua/config/settings.lua index 41e0584..14d4def 100644 --- a/nvim/lua/config/settings.lua +++ b/nvim/lua/config/settings.lua @@ -1,7 +1,7 @@ local opt = vim.opt -- Columns and gutters -opt.colorcolumn = "80,100" -- Highlight column 80 +opt.colorcolumn = "80,120" -- Highlight columns 80, 120 opt.number = true -- Line numbers in the gutter opt.relativenumber = true -- Relative line numbers in the gutter opt.signcolumn = "yes:1" -- Sign column in the gutter always visible diff --git a/nvim/lua/plugins/41-autoformat.lua b/nvim/lua/plugins/41-autoformat.lua index 5597710..c2e9617 100644 --- a/nvim/lua/plugins/41-autoformat.lua +++ b/nvim/lua/plugins/41-autoformat.lua @@ -39,12 +39,8 @@ return { swift = { "swiftformat" }, terraform = { "terraform_fmt" }, xml = { "xmllint" }, - yaml = { "yamlfix" }, - }, - formatters = { - yamlfix = { - prepend_args = { "-c", ".yamlfix.toml" }, - }, + yaml = { "prettierd" }, }, + formatters = {}, }, } diff --git a/setup.sh b/setup.sh index d26b138..e551e55 100755 --- a/setup.sh +++ b/setup.sh @@ -10,7 +10,7 @@ if [[ ! -d $XDG_CONFIG_HOME ]]; then fi # Symlink directories to $XDG_CONFIG_HOME. -directories=("gem" "ghostty" "git" "gnupg" "k9s" "lazygit" "neovide" "nvim" "starship" "tmux" "zed") +directories=("gem" "ghostty" "git" "gnupg" "k9s" "lazygit" "mise" "neovide" "nvim" "starship" "tmux" "zed") for directory in "${directories[@]}"; do if [[ -d "$XDG_CONFIG_HOME/$directory" ]]; then continue; fi ln -sfv "$SCRIPTPATH/$directory" "$XDG_CONFIG_HOME/$directory" diff --git a/zsh/zprofile b/zsh/zprofile index c3fceca..08827eb 100644 --- a/zsh/zprofile +++ b/zsh/zprofile @@ -22,8 +22,15 @@ if [[ -a "/opt/homebrew/bin/brew" ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" fi # asdf -if [[ -d "$HOME/.asdf/shims" ]]; then - export PATH="$HOME/.asdf/shims:$PATH" +if [[ -d "$HOME/.asdf" ]]; then + # export PATH="$HOME/.asdf/shims:$PATH" + export ASDF_DATA_DIR=$HOME/.asdf + export ASDF_CONFIG_FILE=$HOME/.asdfrc +fi +# mise +if [[ -x "$(command -v mise)" ]]; then + export MISE_PYTHON_DEFAULT_PACKAGES_FILE=$XDG_CONFIG_HOME/mise/.default-python-packages + eval "$(mise activate zsh)" fi # plugins diff --git a/zsh/zshenv b/zsh/zshenv index db0b289..edf3cb2 100644 --- a/zsh/zshenv +++ b/zsh/zshenv @@ -53,9 +53,17 @@ if [[ -d "$HOME/bin" ]]; then fi # asdf -if [[ -d "$HOME/.asdf/shims" ]]; then - export PATH="$HOME/.asdf/shims:$PATH" +if [[ -d "$HOME/.asdf" ]]; then + # export PATH="$HOME/.asdf/shims:$PATH" + export ASDF_DATA_DIR=$HOME/.asdf + export ASDF_CONFIG_FILE=$HOME/.asdfrc fi +# mise +if [[ -x "$(command -v mise)" ]]; then + export MISE_PYTHON_DEFAULT_PACKAGES_FILE=$XDG_CONFIG_HOME/mise/.default-python-packages + eval "$(mise activate zsh)" +fi + if [[ -d "/opt/homebrew/share/google-cloud-sdk/bin" ]]; then export PATH=/opt/homebrew/share/google-cloud-sdk/bin:$PATH fi