diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 7ce7ffc..e903fed 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -30,6 +30,11 @@ Plug 'hrsh7th/cmp-path'
 Plug 'hrsh7th/cmp-cmdline'
 Plug 'hrsh7th/nvim-cmp'
 
+" languages: dart/flutter
+Plug 'nvim-lua/plenary.nvim'
+Plug 'stevearc/dressing.nvim'
+Plug 'akinsho/flutter-tools.nvim'
+
 " snippets
 
 Plug 'hrsh7th/cmp-vsnip'
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 3e4348a..6921e08 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -8,7 +8,7 @@ vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
+local on_attach = function(bufnr)
 	-- Enable completion triggered by <c-x><c-o>
 	vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
@@ -32,6 +32,14 @@ local on_attach = function(client, bufnr)
 	vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
 	vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
 end
+vim.api.nvim_create_autocmd('LspAttach', {
+	callback = function(ev)
+		on_attach(ev.buf)
+	end,
+})
+local on_attach_mason = function(client, bufnr)
+	on_attach(bufnr)
+end
 
 -- Add additional capabilities supported by nvim-cmp
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
@@ -43,12 +51,15 @@ require('mason-lspconfig').setup()
 require('mason-lspconfig').setup_handlers {
 	function (server_name)
 		lspconfig[server_name].setup {
-			on_attach = on_attach,
+			on_attach = on_attach_mason,
 			capabilities = capabilities,
 		}
 	end
 }
 
+-- Configure dart/flutter
+require("flutter-tools").setup {}
+
 -- Configure nvim-cmp
 local cmp = require('cmp')
 cmp.setup {
diff --git a/.zshrc b/.zshrc
index 6c75f33..e0e6842 100644
--- a/.zshrc
+++ b/.zshrc
@@ -115,6 +115,12 @@ setup_nvm_on_demand() {
 }
 export NVM_DIR="$HOME/.nvm"
 [[ -d "$NVM_DIR" ]] && setup_nvm_on_demand
+setup_bun() {
+	[ -s "/var/home/ambrose/.bun/_bun" ] && source "/var/home/ambrose/.bun/_bun"
+	export PATH="$BUN_INSTALL/bin:$PATH"
+}
+export BUN_INSTALL="$HOME/.bun"
+[[ -d "$BUN_INSTALL" ]] && setup_bun
 setup_ruby() {
 	export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH"
 }
@@ -127,6 +133,10 @@ setup_g() {
 	export PATH="$HOME/go/bin:$PATH" GOPATH="$HOME/go" GOROOT="$HOME/.go" # g-install: do NOT edit, see https://github.com/stefanmaric/g
 }
 [[ -f "$HOME/go/bin/g" ]] && setup_g
+setup_rancher_desktop() {
+	export PATH="$HOME/.rd/bin:$PATH"
+}
+[[ -d "$HOME/.rd/bin" ]] && setup_rancher_desktop
 setup_android_sdk() {
 	# See ~/.local/bin/install_android_sdk
 	export ANDROID_SDK_ROOT="$HOME/.android/sdk"