diff --git a/.config/nvim/after/ftplugin/rust.lua b/.config/nvim/after/ftplugin/rust.lua
new file mode 100644
index 0000000..152c530
--- /dev/null
+++ b/.config/nvim/after/ftplugin/rust.lua
@@ -0,0 +1,9 @@
+-- local bufnr = vim.api.nvim_get_current_buf()
+-- vim.keymap.set(
+-- 	'n',
+-- 	'<leader>a',
+-- 	function()
+-- 		vim.cmd.RustLsp('codeAction')
+-- 	end,
+-- 	{silent= true, buffer = bufnr}
+-- )
diff --git a/.config/nvim/lua/klowner/core.lua b/.config/nvim/lua/klowner/core.lua
index 05fbe6c..6ed1abb 100644
--- a/.config/nvim/lua/klowner/core.lua
+++ b/.config/nvim/lua/klowner/core.lua
@@ -84,3 +84,9 @@ end
 
 -- :W to save with sudo
 -- vim.api.nvim_create_user_command('')
+-- vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {
+--   group = vim.api.nvim_create_augroup("float_diagnostic_cursor", { clear = false }),
+--   callback = function ()
+--     vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})
+--   end
+-- })
diff --git a/.config/nvim/lua/klowner/plugins/codecompanion.lua b/.config/nvim/lua/klowner/plugins/codecompanion.lua
new file mode 100644
index 0000000..49d4446
--- /dev/null
+++ b/.config/nvim/lua/klowner/plugins/codecompanion.lua
@@ -0,0 +1,36 @@
+return {
+	"olimorris/codecompanion.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-treesitter/nvim-treesitter",
+		"hrsh7th/nvim-cmp", -- Optional: For activating slash commands and variables in the chat buffer
+		"nvim-telescope/telescope.nvim", -- Optional: For working with files with slash commands
+		{
+			"stevearc/dressing.nvim", -- Optional: Improves the default Neovim UI
+			opts = {},
+		},
+	},
+	config = function ()
+		require('codecompanion').setup({
+			strategies = {
+				chat = { adapter = 'ollama' },
+				inline = { adapter = 'ollama' },
+				agent = { adapter = 'ollama' },
+			},
+			adapters = {
+				ollama = function ()
+					return require('codecompanion.adapters').extend('ollama', {
+						schema = {
+							model = {
+								default = 'yi-coder:1.5b',
+							},
+						},
+						env = {
+							url = "https://localhost:11434",
+						},
+					})
+				end,
+			},
+		})
+	end,
+}
diff --git a/.config/nvim/lua/klowner/plugins/dap.lua b/.config/nvim/lua/klowner/plugins/dap.lua
new file mode 100644
index 0000000..ab44a1e
--- /dev/null
+++ b/.config/nvim/lua/klowner/plugins/dap.lua
@@ -0,0 +1,3 @@
+return {
+	"mfussenegger/nvim-dap",
+}
diff --git a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua
index 613fe0c..d1ce678 100644
--- a/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua
+++ b/.config/nvim/lua/klowner/plugins/lsp/lspconfig.lua
@@ -6,6 +6,7 @@ return {
     "hrsh7th/cmp-nvim-lsp-signature-help",
     { "antosha417/nvim-lsp-file-operations", config = true },
     { "folke/neodev.nvim", opts = {} },
+    'j-hui/fidget.nvim',
   },
   config = function()
     -- import lspconfig plugin
diff --git a/.config/nvim/lua/klowner/plugins/lsp/mason.lua b/.config/nvim/lua/klowner/plugins/lsp/mason.lua
index 6cbc31e..10dc3f1 100644
--- a/.config/nvim/lua/klowner/plugins/lsp/mason.lua
+++ b/.config/nvim/lua/klowner/plugins/lsp/mason.lua
@@ -39,6 +39,7 @@ return {
         "svelte",
         "tailwindcss",
         "tsserver",
+        "rust_analyzer",
       },
     })
 
diff --git a/.config/nvim/lua/klowner/plugins/rust.lua b/.config/nvim/lua/klowner/plugins/rust.lua
new file mode 100644
index 0000000..c6b9c35
--- /dev/null
+++ b/.config/nvim/lua/klowner/plugins/rust.lua
@@ -0,0 +1,3 @@
+return {
+	"rust-lang/rust.vim",
+}
diff --git a/.config/nvim/lua/klowner/plugins/telescope.lua b/.config/nvim/lua/klowner/plugins/telescope.lua
index 4fcb92e..b081120 100644
--- a/.config/nvim/lua/klowner/plugins/telescope.lua
+++ b/.config/nvim/lua/klowner/plugins/telescope.lua
@@ -2,10 +2,12 @@ return {
   "nvim-telescope/telescope.nvim",
   branch = "0.1.x",
   dependencies = {
+    "nvim-lua/popup.nvim",
     "nvim-lua/plenary.nvim",
     { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
     "nvim-tree/nvim-web-devicons",
     "folke/todo-comments.nvim",
+    "nvim-telescope/telescope-media-files.nvim",
   },
   config = function()
     local telescope = require("telescope")
@@ -37,6 +39,7 @@ return {
     })
 
     telescope.load_extension("fzf")
+    telescope.load_extension("media_files")
 
     -- set keymaps
     local keymap = vim.keymap -- for conciseness
diff --git a/.config/nvim/lua/klowner/plugins/treesitter.lua b/.config/nvim/lua/klowner/plugins/treesitter.lua
index 0ffa8bf..73ea19e 100644
--- a/.config/nvim/lua/klowner/plugins/treesitter.lua
+++ b/.config/nvim/lua/klowner/plugins/treesitter.lua
@@ -25,21 +25,22 @@ return {
       -- ensure these language parsers are installed
       ensure_installed = {
         "json",
-        "javascript",
-        "typescript",
-        "tsx",
-        "yaml",
-        "html",
+        "bash",
         "css",
-        "prisma",
+        "dockerfile",
+        "graphql",
+        "html",
+        "javascript",
+        "lua",
         "markdown",
         "markdown_inline",
+        "prisma",
+        "rust",
         "svelte",
-        "graphql",
-        "bash",
-        "lua",
+        "tsx",
+        "typescript",
         "vim",
-        "dockerfile",
+        "yaml",
         "gitignore",
         "query",
         "vimdoc",
diff --git a/.config/nvim/lua/klowner/plugins/trouble.lua b/.config/nvim/lua/klowner/plugins/trouble.lua
index 62e1527..4c5fb29 100644
--- a/.config/nvim/lua/klowner/plugins/trouble.lua
+++ b/.config/nvim/lua/klowner/plugins/trouble.lua
@@ -2,11 +2,15 @@ return {
   "folke/trouble.nvim",
   dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" },
   keys = {
-    { "<leader>xx", "<cmd>TroubleToggle<CR>", desc = "Open/close trouble list" },
+    { "<leader>xx", "<cmd>Trouble diagnostics toggle<CR>", desc = "Open/close trouble list" },
     { "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Open trouble workspace diagnostics" },
     { "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>", desc = "Open trouble document diagnostics" },
     { "<leader>xq", "<cmd>TroubleToggle quickfix<CR>", desc = "Open trouble quickfix list" },
     { "<leader>xl", "<cmd>TroubleToggle loclist<CR>", desc = "Open trouble location list" },
     { "<leader>xt", "<cmd>TodoTrouble<CR>", desc = "Open todos in trouble" },
   },
+  config = function ()
+    local trouble = require 'trouble'
+    trouble.setup({})
+  end,
 }
diff --git a/.config/nvim/lua/klowner/plugins/vimspector.lua b/.config/nvim/lua/klowner/plugins/vimspector.lua
new file mode 100644
index 0000000..4cf69c9
--- /dev/null
+++ b/.config/nvim/lua/klowner/plugins/vimspector.lua
@@ -0,0 +1,3 @@
+return {
+	'puremourning/vimspector',
+}