6 files changed, 56 insertions, 11 deletions
diff --git a/brew/.config/Brewfile b/brew/.config/Brewfile
index 354603b..5d4be78 100644
--- a/brew/.config/Brewfile
+++ b/brew/.config/Brewfile
@@ -5,7 +5,7 @@ tap "gyoder/graceful-tap"
 
 # Programming Languages
 brew "go"
-brew "rustup", postinstall: "${HOMEBREW_PREFIX}/opt/rustup/bin/rustup default stable && ${HOMEBREW_PREFIX}/opt/rustup/bin/rustup component add rust-analyzer"
+brew "rustup", postinstall: "${HOMEBREW_PREFIX}/opt/rustup/bin/rustup-init -y && ${HOMEBREW_PREFIX}/opt/rustup/bin/rustup component add rust-analyzer"
 brew "uv"
 brew "llvm"
 brew "cmake"
@@ -45,14 +45,15 @@ brew "fish-lsp"
 brew "gh"
 brew "jj"
 
-
-
-brew "tailscale"
-brew "sqlite"
-brew "asciinema"
-
 # CLI Utils
 brew "ripgrep"
 brew "dust"
 brew "tree"
 brew "stow"
+brew "btop"
+
+# Random
+brew "tailscale"
+brew "sqlite"
+brew "asciinema"
+
diff --git a/fish/.config/fish/conf.d/rustup.fish b/fish/.config/fish/conf.d/rustup.fish
new file mode 100644
index 0000000..e4cb363
--- /dev/null
+++ b/fish/.config/fish/conf.d/rustup.fish
@@ -0,0 +1 @@
+source "$HOME/.cargo/env.fish"
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 277c368..1d47f55 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -44,8 +44,6 @@ else if test "$host" = "lee"
   fish_add_path ~/.local/bin
 end
 
-source "$HOME/.cargo/env.fish" 2>/dev/null
-
 set -gx HOMEBREW_BUNDLE_FILE "~/.config/Brewfile"
 
 if test -d /home/linuxbrew/.linuxbrew
diff --git a/vim/.config/nvim/lsp/ruff.lua b/vim/.config/nvim/lsp/ruff.lua
new file mode 100644
index 0000000..7fb61ea
--- /dev/null
+++ b/vim/.config/nvim/lsp/ruff.lua
@@ -0,0 +1,35 @@
+---@brief
+---
+--- https://github.com/astral-sh/ruff
+---
+--- A Language Server Protocol implementation for Ruff, an extremely fast Python linter and code formatter, written in Rust. It can be installed via `pip`.
+---
+--- ```sh
+--- pip install ruff
+--- ```
+---
+--- **Available in Ruff `v0.4.5` in beta and stabilized in Ruff `v0.5.3`.**
+---
+--- This is the new built-in language server written in Rust. It supports the same feature set as `ruff-lsp`, but with superior performance and no installation required. Note that the `ruff-lsp` server will continue to be maintained until further notice.
+---
+--- Server settings can be provided via:
+---
+--- ```lua
+--- vim.lsp.config('ruff', {
+---   init_options = {
+---     settings = {
+---       -- Server settings should go here
+---     }
+---   }
+--- })
+--- ```
+---
+--- Refer to the [documentation](https://docs.astral.sh/ruff/editors/) for more details.
+
+---@type vim.lsp.Config
+return {
+  cmd = { 'ruff', 'server' },
+  filetypes = { 'python' },
+  root_markers = { 'pyproject.toml', 'ruff.toml', '.ruff.toml', '.git' },
+  settings = {},
+}
diff --git a/vim/.config/nvim/lsp/ty.lua b/vim/.config/nvim/lsp/ty.lua
index 411fbd1..92efaa0 100644
--- a/vim/.config/nvim/lsp/ty.lua
+++ b/vim/.config/nvim/lsp/ty.lua
@@ -1,5 +1,14 @@
+---@brief
+---
+--- https://github.com/astral-sh/ty
+---
+--- A Language Server Protocol implementation for ty, an extremely fast Python type checker and language server, written in Rust.
+---
+--- For installation instructions, please refer to the [ty documentation](https://github.com/astral-sh/ty/blob/main/README.md#getting-started).
+
+---@type vim.lsp.Config
 return {
-  cmd = { 'uvx', 'ty', 'server' },
+  cmd = { 'ty', 'server' },
   filetypes = { 'python' },
-  root_markers = { 'ty.toml', 'pyproject.toml', '.git', '.jj' },
+  root_markers = { 'ty.toml', 'pyproject.toml', 'setup.py', 'setup.cfg', 'requirements.txt', '.git', '.jj' },
 }
diff --git a/vim/.config/nvim/lua/native-lsp.lua b/vim/.config/nvim/lua/native-lsp.lua
index ae08059..33c9c01 100644
--- a/vim/.config/nvim/lua/native-lsp.lua
+++ b/vim/.config/nvim/lua/native-lsp.lua
@@ -24,6 +24,7 @@ vim.lsp.config('ty', {
 })
 
 -- vim.lsp.enable("ty")
+vim.lsp.enable("ruff")