diff --git a/lazy-lock.json b/lazy-lock.json
index 2314986..3bb31eb 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -34,6 +34,7 @@
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
+  "lazy-lsp.nvim": { "branch": "master", "commit": "3ce514080931ca6c35036dd9f90da879e9ab3204" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
   "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
diff --git a/lua/plugins/base16.lua b/lua/plugins/base16.lua
index 566db61..2f72cff 100644
--- a/lua/plugins/base16.lua
+++ b/lua/plugins/base16.lua
@@ -1,6 +1,7 @@
 return {
     {
         "rktjmp/fwatch.nvim",
+        enabled = false,
         dependencies = {
             "xiyaowong/transparent.nvim", -- For Transparency support
             { "echasnovski/mini.nvim", version = false },
@@ -66,5 +67,6 @@ return {
         "brenoprata10/nvim-highlight-colors",
         opts = {},
         event = "VeryLazy",
+        enabled = false,
     },
 }
diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua
index f489ccb..48a1bce 100644
--- a/lua/plugins/catppuccin.lua
+++ b/lua/plugins/catppuccin.lua
@@ -2,17 +2,56 @@ return {
     {
         "catppuccin/nvim",
         name = "catppuccin",
+        dependencies = {
+            "xiyaowong/transparent.nvim", -- For Transparency support
+        },
         opts = {
             styles = {
                 functions = { "italic" },
                 keywords = { "italic" },
             },
+            transparent_background = true,
+        },
+        config = function(opts)
+            require("catppuccin").setup(opts)
+            vim.g.neovide_transparency = 0.8
+            if not vim.g.neovide then
+                require("transparent").setup {
+                    groups = {
+                        "Normal",
+                        "NormalNC",
+                        "Comment",
+                        "Constant",
+                        "Special",
+                        "Identifier",
+                        "Statement",
+                        "PreProc",
+                        "Type",
+                        "Underlined",
+                        "Todo",
+                        "String",
+                        "Function",
+                        "Conditional",
+                        "Repeat",
+                        "Operator",
+                        "Structure",
+                        "LineNr",
+                        "NonText",
+                        "SignColumn",
+                        -- "CursorLine",
+                        -- "CursorLineNr",
+                        "StatusLine",
+                        "StatusLineNC",
+                        "EndOfBuffer",
+                    },
+                }
+            end
+        end,
+    },
+    {
+        "LazyVim/LazyVim",
+        opts = {
+            colorscheme = "catppuccin",
         },
     },
-    -- {
-    --     "LazyVim/LazyVim",
-    --     opts = {
-    --         colorscheme = "catppuccin",
-    --     },
-    -- },
 }
diff --git a/lua/plugins/lsp-lazy.lua b/lua/plugins/lsp-lazy.lua
index 9c85bb6..3ffbf8f 100644
--- a/lua/plugins/lsp-lazy.lua
+++ b/lua/plugins/lsp-lazy.lua
@@ -2,7 +2,12 @@ return {
     "dundalek/lazy-lsp.nvim",
     dependencies = { "neovim/nvim-lspconfig" },
     opts = {
-        excluded_servers = { "jdtls", "gopls", "tsserver" },
+        prefer_local = true,
+        preferred_servers = {
+            nix = {
+                "nil_ls",
+            },
+        },
     },
-    enabled = false,
+    -- enabled = false,
 }
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index f02af8c..dce92d3 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -56,6 +56,9 @@ return {
                     client.server_capabilities.documentRangeFormattingProvider = false
                 end,
             },
+            lua_ls = {
+                mason = false;
+            };
         },
     },
 }
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
new file mode 100644
index 0000000..1e57d3e
--- /dev/null
+++ b/lua/plugins/mason.lua
@@ -0,0 +1,4 @@
+return {
+    "mason.nvim",
+    enabled = false,
+}