diff --git a/lua/custom/plugins/code_companion.lua b/lua/custom/plugins/code_companion.lua
new file mode 100644
index 00000000..04b34ce1
--- /dev/null
+++ b/lua/custom/plugins/code_companion.lua
@@ -0,0 +1,8 @@
+return {
+  'olimorris/codecompanion.nvim',
+  opts = {},
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'nvim-treesitter/nvim-treesitter',
+  },
+}
diff --git a/lua/custom/plugins/cyberdream.lua b/lua/custom/plugins/cyberdream.lua
deleted file mode 100644
index 24b84a36..00000000
--- a/lua/custom/plugins/cyberdream.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  'scottmckendry/cyberdream.nvim',
-  lazy = false,
-  priority = 1000,
-}
diff --git a/lua/custom/plugins/golf.lua b/lua/custom/plugins/golf.lua
new file mode 100644
index 00000000..b21cf44f
--- /dev/null
+++ b/lua/custom/plugins/golf.lua
@@ -0,0 +1,3 @@
+return {
+  { 'vuciv/golf' },
+}
diff --git a/lua/custom/plugins/neotest.lua b/lua/custom/plugins/neotest.lua
new file mode 100644
index 00000000..04b3e0ab
--- /dev/null
+++ b/lua/custom/plugins/neotest.lua
@@ -0,0 +1,16 @@
+return {
+  'nvim-neotest/neotest',
+  dependencies = {
+    'nvim-neotest/nvim-nio',
+    'nvim-lua/plenary.nvim',
+    'antoinemadec/FixCursorHold.nvim',
+    'nvim-treesitter/nvim-treesitter',
+  },
+  config = function()
+    require('neotest').setup {
+      adapters = {
+        require 'rustaceanvim.neotest',
+      },
+    }
+  end,
+}
diff --git a/lua/custom/plugins/nvim_bacon.lua b/lua/custom/plugins/nvim_bacon.lua
new file mode 100644
index 00000000..df4cc955
--- /dev/null
+++ b/lua/custom/plugins/nvim_bacon.lua
@@ -0,0 +1,14 @@
+return {
+  -- other plugins
+  {
+    'Canop/nvim-bacon',
+    config = function()
+      require('bacon').setup {
+        quickfix = {
+          enabled = true, -- Enable Quickfix integration
+          event_trigger = true, -- Trigger QuickFixCmdPost after populating Quickfix list
+        },
+      }
+    end,
+  },
+}
diff --git a/lua/custom/plugins/obsidian.lua b/lua/custom/plugins/obsidian.lua
index d35cfa79..6ee5642d 100644
--- a/lua/custom/plugins/obsidian.lua
+++ b/lua/custom/plugins/obsidian.lua
@@ -25,6 +25,8 @@ return {
       },
     },
 
-    -- see below for full list of options 👇
+    checkbox = {
+      order = { ' ', 'x', '~', '!', '>' },
+    },
   },
 }
diff --git a/lua/custom/plugins/pencil.lua b/lua/custom/plugins/pencil.lua
new file mode 100644
index 00000000..b4aecdb7
--- /dev/null
+++ b/lua/custom/plugins/pencil.lua
@@ -0,0 +1,7 @@
+return {
+  'preservim/vim-pencil',
+  init = function()
+    vim.g['pencil#wrapModeDefault'] = 'soft'
+    vim.g['pencil#conceallevel'] = 2
+  end,
+}
diff --git a/lua/custom/plugins/quickscope.lua b/lua/custom/plugins/quickscope.lua
new file mode 100644
index 00000000..d8fabaa7
--- /dev/null
+++ b/lua/custom/plugins/quickscope.lua
@@ -0,0 +1,10 @@
+return {
+  'unblevable/quick-scope',
+  event = { 'VimEnter' }, -- Load plugin on VimEnter event
+  config = function()
+    -- Enable QuickScope highlighting
+    vim.cmd [[
+      let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
+    ]]
+  end,
+}
diff --git a/lua/custom/plugins/rustaceanvim.lua b/lua/custom/plugins/rustaceanvim.lua
index 46c4c82f..96b79eaa 100644
--- a/lua/custom/plugins/rustaceanvim.lua
+++ b/lua/custom/plugins/rustaceanvim.lua
@@ -1,5 +1,43 @@
 return {
   'mrcjkb/rustaceanvim',
-  version = '^5', -- Recommended
+  version = '^6', -- Recommended
   lazy = false, -- This plugin is already lazy
+  dependencies = { 'nvim-neotest/neotest' },
+  config = function()
+    vim.g.rustaceanvim = {
+      server = {
+        settings = {
+          ['rust-analyzer'] = {
+            check = {
+              command = 'clippy',
+              extra_args = {
+                '--',
+                '-W',
+                'clippy::pedantic',
+                '-W',
+                'clippy::unwrap_used',
+                '-W',
+                'clippy::expect_used',
+                '-W',
+                'clippy::panic',
+                '-W',
+                'clippy::exit',
+                '-W',
+                'clippy::todo',
+                '-W',
+                'clippy::unimplemented',
+                '-W',
+                'clippy::dbg_macro',
+                '-A',
+                'clippy::module_name_repetitions',
+              },
+            },
+            rustfmt = {
+              extraArgs = { '+nightly' },
+            },
+          },
+        },
+      },
+    }
+  end,
 }
diff --git a/lua/custom/plugins/trouble.lua b/lua/custom/plugins/trouble.lua
index d0578c9f..9561d5a4 100644
--- a/lua/custom/plugins/trouble.lua
+++ b/lua/custom/plugins/trouble.lua
@@ -4,10 +4,20 @@ return {
   cmd = 'Trouble',
   keys = {
     {
-      '<leader>xx',
+      '<leader>xd',
       '<cmd>Trouble diagnostics toggle<cr>',
       desc = 'Diagnostics (Trouble)',
     },
+    {
+      '<leader>xl',
+      function()
+        require('trouble').toggle {
+          mode = 'diagnostics',
+          win = { position = 'right', type = 'split', size = 75 },
+        }
+      end,
+      desc = 'Toggle Trouble diagnostics sidebar',
+    },
     {
       '<leader>xX',
       '<cmd>Trouble diagnostics toggle filter.buf=0<cr>',