diff --git a/.config/nvim/lua/plugins/core.lua b/.config/nvim/lua/plugins/core.lua
index b73c083..b1953c5 100644
--- a/.config/nvim/lua/plugins/core.lua
+++ b/.config/nvim/lua/plugins/core.lua
@@ -1,4 +1,10 @@
 return {
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "catppuccin-mocha",
+    },
+  },
   {
     "catppuccin/nvim",
     lazy = true,
@@ -45,9 +51,55 @@ return {
     },
   },
   {
-    "LazyVim/LazyVim",
+    "nvim-telescope/telescope.nvim",
+    keys = {
+      {
+        "<leader>fp",
+        function()
+          require("telescope.builtin").find_files({
+            cwd = require("lazy.core.config").options.root,
+          })
+        end,
+        desc = "Find Plugin File",
+      },
+    },
+    -- change some options
     opts = {
-      colorscheme = "catppuccin",
+      defaults = {
+        layout_strategy = "horizontal",
+        layout_config = { prompt_position = "top" },
+        sorting_strategy = "ascending",
+        winblend = 0,
+      },
+    },
+  },
+  {
+    "christoomey/vim-tmux-navigator",
+    lazy = false,
+  },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "bash",
+        "html",
+        "javascript",
+        "json",
+        "lua",
+        "markdown",
+        "markdown_inline",
+        "python",
+        "query",
+        "regex",
+        "tsx",
+        "typescript",
+        "vim",
+        "yaml",
+        "go",
+        "terraform",
+        "c_sharp",
+        "bash",
+      },
     },
   },
 }
diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua
new file mode 100644
index 0000000..cbcd9b0
--- /dev/null
+++ b/.config/nvim/lua/plugins/mason.lua
@@ -0,0 +1,28 @@
+return {
+  {
+    "mason-org/mason.nvim",
+    version = "^1.0.0",
+    opts = {
+      ensure_installed = {
+        --"gopls",
+        --"rust-analyzer",
+        --"pyright",
+        --"mypy",
+        --"ruff",
+        --"black",
+        --"debugpy",
+        "powershell-editor-services",
+        "bash-language-server",
+        --"eslint-lsp",
+        --"js-debug-adapter",
+        --"prettier",
+        --"typescript-language-server",
+        --"stylua",
+        --"shellcheck",
+        --"shfmt",
+        --"flake8",
+      },
+    },
+  },
+  { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
+}
diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua
index 74a9d69..26c4c2c 100644
--- a/.config/nvim/lua/plugins/misc.lua
+++ b/.config/nvim/lua/plugins/misc.lua
@@ -1,161 +1,64 @@
 return {
-  {
-    "mason-org/mason.nvim",
-    version = "^1.0.0",
-    opts = {
-      ensure_installed = {
-        "gopls",
-        "rust-analyzer",
-        "pyright",
-        "mypy",
-        "ruff",
-        "black",
-        "debugpy",
-        "powershell-editor-services",
-        "bash-language-server",
-        "eslint-lsp",
-        "js-debug-adapter",
-        "prettier",
-        "typescript-language-server",
-        "stylua",
-        "shellcheck",
-        "shfmt",
-        "flake8",
-      },
-    },
-  },
-  { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = {
-      ensure_installed = {
-        "bash",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "tsx",
-        "typescript",
-        "vim",
-        "yaml",
-        "go",
-        "terraform",
-        "c_sharp",
-        "bash",
-      },
-    },
-  },
-  {
-    "christoomey/vim-tmux-navigator",
-    lazy = false,
-  },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "catppuccin-mocha",
-    },
-  },
-  {
-    "catppuccin/nvim",
-    lazy = false,
-    name = "catppuccin",
-    opts = {},
-  },
-  {
-    "folke/trouble.nvim",
-    opts = { use_diagnostic_signs = true },
-  },
-  {
-    "nvim-telescope/telescope.nvim",
-    keys = {
-      {
-        "<leader>fp",
-        function()
-          require("telescope.builtin").find_files({
-            cwd = require("lazy.core.config").options.root,
-          })
-        end,
-        desc = "Find Plugin File",
-      },
-    },
-    -- change some options
-    opts = {
-      defaults = {
-        layout_strategy = "horizontal",
-        layout_config = { prompt_position = "top" },
-        sorting_strategy = "ascending",
-        winblend = 0,
-      },
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    ---@class PluginLspOpts
-    opts = {
-      servers = {
-        pyright = {
-          filetypes = { "python" },
-        },
-        gopls = {
-          cmd = { "gopls" },
-          filetypes = { "go", "gomod", "gowork", "gotmpl" },
-          --root_dir = util.root_pattern("go.work", "go.mod", ".git"),
-          settings = {
-            gopls = {
-              completeUnimported = true,
-              usePlaceholders = true,
-              analyses = {
-                unusedparams = true,
-              },
-            },
-          },
-        },
-        tsserver = {},
-        powershell_es = {
-          bundle_path = vim.fn.stdpath("data")
-            .. "/mason/packages/powershell-editor-services",
-        },
-      },
-    },
-  },
-  {
-    "lewis6991/gitsigns.nvim",
-    config = function()
-      require("gitsigns").setup()
-    end,
-  },
-  {
-    "TheLeoP/powershell.nvim",
-    opts = {
-      bundle_path = vim.fn.stdpath("data")
-        .. "/man/packages/powershell-editor-services",
-    },
-  },
-  {
-    "olexsmir/gopher.nvim",
-    ft = "go",
-    config = function(_, opts)
-      require("gopher").setup(opts)
-    end,
-    build = function()
-      vim.cmd([[silent! GoInstallDeps]])
-    end,
-  },
-  {
-    "MeanderingProgrammer/render-markdown.nvim",
-    dependencies = {
-      "nvim-treesitter/nvim-treesitter",
-      "echasnovski/mini.nvim",
-    }, -- if you use the mini.nvim suite
-    ---@module 'render-markdown'
-    ---@type render.md.UserConfig
-    opts = {},
-  },
+  --{
+  --  "folke/trouble.nvim",
+  --  opts = { use_diagnostic_signs = true },
+  --},
+  --{
+  --  "neovim/nvim-lspconfig",
+  --  ---@class PluginLspOpts
+  --  opts = {
+  --    servers = {
+  --      --pyright = {
+  --      --  filetypes = { "python" },
+  --      --},
+  --      gopls = {
+  --        cmd = { "gopls" },
+  --        filetypes = { "go", "gomod", "gowork", "gotmpl" },
+  --        --root_dir = util.root_pattern("go.work", "go.mod", ".git"),
+  --        settings = {
+  --          gopls = {
+  --            completeUnimported = true,
+  --            usePlaceholders = true,
+  --            analyses = {
+  --              unusedparams = true,
+  --            },
+  --          },
+  --        },
+  --      },
+  --      --tsserver = {},
+  --      powershell_es = {
+  --        bundle_path = vim.fn.stdpath("data")
+  --          .. "/mason/packages/powershell-editor-services",
+  --      },
+  --    },
+  --  },
+  --},
+  --{
+  --  "lewis6991/gitsigns.nvim",
+  --  config = function()
+  --    require("gitsigns").setup()
+  --  end,
+  --},
+  --{
+  --  "olexsmir/gopher.nvim",
+  --  ft = "go",
+  --  config = function(_, opts)
+  --    require("gopher").setup(opts)
+  --  end,
+  --  build = function()
+  --    vim.cmd([[silent! GoInstallDeps]])
+  --  end,
+  --},
+  --{
+  --  "MeanderingProgrammer/render-markdown.nvim",
+  --  dependencies = {
+  --    "nvim-treesitter/nvim-treesitter",
+  --    "echasnovski/mini.nvim",
+  --  }, -- if you use the mini.nvim suite
+  --  ---@module 'render-markdown'
+  --  ---@type render.md.UserConfig
+  --  opts = {},
+  --},
   {
     "mistweaverco/kulala.nvim",
     opts = {
@@ -164,10 +67,6 @@ return {
   },
   {
     "folke/zen-mode.nvim",
-    opts = {
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-    },
+    opts = {},
   },
 }
diff --git a/.config/nvim/lua/plugins/powershell.lua b/.config/nvim/lua/plugins/powershell.lua
new file mode 100644
index 0000000..fab0f90
--- /dev/null
+++ b/.config/nvim/lua/plugins/powershell.lua
@@ -0,0 +1,9 @@
+return {
+  {
+    "TheLeoP/powershell.nvim",
+    opts = {
+      bundle_path = vim.fn.stdpath("data")
+        .. "/man/packages/powershell-editor-services",
+    },
+  },
+}
diff --git a/.nixpkgs/config.nix b/.nixpkgs/config.nix
index d1d689a..8f9e75a 100644
--- a/.nixpkgs/config.nix
+++ b/.nixpkgs/config.nix
@@ -18,7 +18,6 @@
         bat
         opentofu
         helm
-        ansible
       ];
     };
   };