diff --git a/.install/packages/shell.sh b/.install/packages/shell.sh index 8d88b87..031b57a 100644 --- a/.install/packages/shell.sh +++ b/.install/packages/shell.sh @@ -11,6 +11,7 @@ packagesPacman=( 'fzf' "neovim" "ttf-jetbrains-mono-nerd" + "mise" "btop" "cmatrix" "dotnet-runtime" @@ -26,6 +27,5 @@ packagesPacman=( packagesYay=( "lazydocker" - "asdf-vm" "cava" ) diff --git a/.install/symlink.sh b/.install/symlink.sh index 56d30ee..58b374c 100755 --- a/.install/symlink.sh +++ b/.install/symlink.sh @@ -5,7 +5,6 @@ files=( ".bashrc" ".gitconfig" ".zshrc" - ".tool-versions" ) _symlinkFiles() { @@ -25,6 +24,7 @@ directories=( "cava" "hypr" "kitty" + "mise" "neofetch" "nvim" "rofi" diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 3bc61fa..0000000 --- a/.tool-versions +++ /dev/null @@ -1,4 +0,0 @@ -nodejs 22.9.0 -bun 1.2.0 -golang 1.23.1 -rust 1.81.0 diff --git a/.zshrc b/.zshrc index c055656..b0b70e2 100644 --- a/.zshrc +++ b/.zshrc @@ -73,13 +73,14 @@ cat ~/.cache/wal/sequences # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git asdf gh bun npm yarn) +plugins=(git gh bun npm yarn mise) source $ZSH/oh-my-zsh.sh # User configuration # export MANPATH="/usr/local/man:$MANPATH" +export PATH="$HOME/.local/bin:$PATH" # You may need to manually set your language environment # export LANG=en_US.UTF-8 @@ -104,13 +105,8 @@ source $ZSH/oh-my-zsh.sh # alias ohmyzsh="mate ~/.oh-my-zsh" alias dotfiles="~/dotfiles/" alias nv="nvim" -alias dev="~/Development" alias pywal="~/dotfiles/.scripts/pywal.sh" -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh -. "$HOME/.asdf/installs/rust/1.81.0/env" - # Lines configured by zsh-newuser-install HISTFILE=~/.histfile HISTSIZE=50 @@ -124,7 +120,10 @@ autoload -Uz compinit compinit # End of lines added by compinstall -neofetch --ascii ~/dotfiles/ascii.txt +eval "$(mise activate zsh)" +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh export EDITOR=nvim -export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH" + +neofetch --ascii ~/dotfiles/ascii.txt diff --git a/mise/config.toml b/mise/config.toml new file mode 100644 index 0000000..ffcdb82 --- /dev/null +++ b/mise/config.toml @@ -0,0 +1,6 @@ +[tools] +go = "latest" +node = "latest" +rust = "latest" +bun = "latest" +dotnet = "8"