Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
4 changes: 2 additions & 2 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"ignorePatterns": [
".mise/locks/**",
"home/.config/mise/config.toml",
"home/.config/mise/locks/**",
"config.toml",
"locks/**",
"home/.config/nvim/lazy-lock.json"
]
}
2 changes: 1 addition & 1 deletion .yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
extends: default
ignore: |
.mise/locks/
home/.config/mise/locks/
locks/
rules:
comments:
level: error
Expand Down
6 changes: 4 additions & 2 deletions home/.config/mise/config.toml → config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ login_shell = "{{ system_brew_prefix }}/bin/zsh"
"~/.config/homebrew" = {}
"~/.config/jj" = {}
"~/.config/karabiner" = {}
"~/.config/mise" = {}
"~/.config/nvim" = {}
"~/.config/omniwm" = {}
"~/.config/process-compose" = {}
Expand All @@ -197,11 +196,14 @@ login_shell = "{{ system_brew_prefix }}/bin/zsh"
auto_update = true

[settings.dotfiles]
root = "~/.dotfiles/home"
root = "~/.config/mise/home"

[settings.github]
use_git_credentials = true

[settings.history]
sync = "manual"

[tasks.bootstrap]
depends = ["bootstrap:**"]

Expand Down
410 changes: 0 additions & 410 deletions home/.config/mise/mise.lock

This file was deleted.

6 changes: 3 additions & 3 deletions home/.local/bin/update-system
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -euo pipefail

# mise
mise self-update --yes
mise -C ~/.dotfiles bootstrap --yes --skip repos --update --upgrade
mise -C ~/.dotfiles lock
mise -C ~/.dotfiles lock --global
mise -C ~/.config/mise bootstrap --yes --skip repos --update --upgrade
mise -C ~/.config/mise lock
mise -C ~/.config/mise lock --global
mise prune --yes

# Homebrew
Expand Down
18 changes: 7 additions & 11 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

set -euo pipefail

DOTFILES="$HOME/.dotfiles"

export MISE_GLOBAL_CONFIG_FILE="$DOTFILES/home/.config/mise/config.toml"
export MISE_TRUSTED_CONFIG_PATHS="$DOTFILES"

# TODO: Remove this version pin once the fixes are included in the default installer release.
# ref: https://github.com/jdx/mise/pull/14570
# ref: https://github.com/jdx/mise/pull/14572
Expand All @@ -16,11 +11,6 @@ export MISE_VERSION="v2026.10.13"
# ref: https://github.com/jdx/mise/pull/14596
export PATH="/nix/var/nix/profiles/default/bin:$PATH"

# Clone dotfiles repository.
if [ ! -d "$DOTFILES" ]; then
git clone https://github.com/ponko2/dotfiles.git "$DOTFILES"
fi

# Resolve mise executable.
MISE="$(command -v mise 2>/dev/null || echo "$HOME/.local/bin/mise")"

Expand All @@ -29,4 +19,10 @@ if [ ! -x "$MISE" ]; then
curl -fsSL https://mise.run | sh
fi

"$MISE" -C "$DOTFILES" bootstrap --yes
if ! "$MISE" exec gh@latest -- gh auth status --active --hostname github.com >/dev/null 2>&1; then
"$MISE" exec gh@latest -- gh auth login --hostname github.com --git-protocol https --web
fi

"$MISE" exec gh@latest -- gh auth setup-git --hostname github.com

"$MISE" bootstrap --adopt ponko2/dotfiles --yes
File renamed without changes.
243 changes: 241 additions & 2 deletions mise.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading