diff --git a/lua/after/keybinds.lua b/after/plugin/init.lua
similarity index 100%
rename from lua/after/keybinds.lua
rename to after/plugin/init.lua
diff --git a/after/plugin/keybinds.lua b/after/plugin/keybinds.lua
new file mode 100644
index 00000000..9b2771c1
--- /dev/null
+++ b/after/plugin/keybinds.lua
@@ -0,0 +1,14 @@
+-- Move between windows with arrows
+vim.keymap.set('n', '<C-Left>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+vim.keymap.set('n', '<C-Right>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+vim.keymap.set('n', '<C-Down>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+vim.keymap.set('n', '<C-Up>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+
+-- Keep cursor centered when PgUp & PgDown
+vim.keymap.set({ 'n', 'i', 'v' }, '<PageUp>', '<PageUp>zz', { desc = 'Page up' })
+vim.keymap.set({ 'n', 'i', 'v' }, '<PageDown>', '<PageDown>zz', { desc = 'Page down' })
+
+-- Redirect command output and allow edit
+vim.keymap.set('c', '<S-CR>', function()
+  require('noice').redirect(vim.fn.getcmdline())
+end, { desc = 'Redirect Cmdline' })
diff --git a/init.lua b/init.lua
index fa5a7b7f..344ea8cc 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
 -- Set to disable providers from loading
--- vim.g.loaded_node_provider = 0
+vim.g.loaded_node_provider = 1
 vim.g.loaded_perl_provider = 0
 vim.g.loaded_python3_provider = 0
 vim.g.loaded_ruby_provider = 0
@@ -203,10 +203,10 @@ vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }
 --  Use CTRL+<hjkl> to switch between windows
 --
 --  See `:help wincmd` for a list of all window commands
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
+-- vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+-- vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+-- vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
+-- vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
 -- [[ Basic Autocommands ]]
 --  See `:help lua-guide-autocommands`
@@ -214,13 +214,6 @@ vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper win
 -- Highlight when yanking (copying) text
 --  Try it with `yap` in normal mode
 --  See `:help vim.highlight.on_yank()`
-vim.api.nvim_create_autocmd('TextYankPost', {
-  desc = 'Highlight when yanking (copying) text',
-  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-})
 
 -- [[ Install `lazy.nvim` plugin manager ]]
 --    See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
@@ -242,634 +235,8 @@ vim.opt.rtp:prepend(lazypath)
 --    :Lazy update
 --
 -- NOTE: Here is where you install your plugins.
-require('lazy').setup({
-  -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
-  'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
-
-  -- NOTE: Plugins can also be added by using a table,
-  -- with the first argument being the link and the following
-  -- keys can be used to configure plugin behavior/loading/etc.
-  --
-  -- Use `opts = {}` to force a plugin to be loaded.
-  --
-  --  This is equivalent to:
-  --    require('Comment').setup({})
-
-  -- "gc" to comment visual regions/lines
-  { 'numToStr/Comment.nvim', opts = {} },
-
-  -- Here is a more advanced example where we pass configuration
-  -- options to `gitsigns.nvim`. This is equivalent to the following Lua:
-  --    require('gitsigns').setup({ ... })
-  --
-  -- See `:help gitsigns` to understand what the configuration keys do
-  { -- Adds git related signs to the gutter, as well as utilities for managing changes
-    'lewis6991/gitsigns.nvim',
-    opts = {
-      signs = {
-        add = { text = '+' },
-        change = { text = '~' },
-        delete = { text = '_' },
-        topdelete = { text = '‾' },
-        changedelete = { text = '~' },
-      },
-    },
-  },
-
-  -- NOTE: Plugins can also be configured to run Lua code when they are loaded.
-  --
-  -- This is often very useful to both group configuration, as well as handle
-  -- lazy loading plugins that don't need to be loaded immediately at startup.
-  --
-  -- For example, in the following configuration, we use:
-  --  event = 'VimEnter'
-  --
-  -- which loads which-key before all the UI elements are loaded. Events can be
-  -- normal autocommands events (`:help autocmd-events`).
-  --
-  -- Then, because we use the `config` key, the configuration only runs
-  -- after the plugin has been loaded:
-  --  config = function() ... end
-
-  { -- Useful plugin to show you pending keybinds.
-    'folke/which-key.nvim',
-    event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    config = function() -- This is the function that runs, AFTER loading
-      require('which-key').setup()
-
-      -- Document existing key chains
-      require('which-key').register {
-        ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
-        ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
-        ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
-        ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
-        ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
-      }
-    end,
-  },
-
-  -- NOTE: Plugins can specify dependencies.
-  --
-  -- The dependencies are proper plugin specifications as well - anything
-  -- you do for a plugin at the top level, you can do for a dependency.
-  --
-  -- Use the `dependencies` key to specify the dependencies of a particular plugin
-
-  { -- Fuzzy Finder (files, lsp, etc)
-    'nvim-telescope/telescope.nvim',
-    event = 'VimEnter',
-    branch = '0.1.x',
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-      { -- If encountering errors, see telescope-fzf-native README for installation instructions
-        'nvim-telescope/telescope-fzf-native.nvim',
-
-        -- `build` is used to run some command when the plugin is installed/updated.
-        -- This is only run then, not every time Neovim starts up.
-        build = 'make',
-
-        -- `cond` is a condition used to determine whether this plugin should be
-        -- installed and loaded.
-        cond = function()
-          return vim.fn.executable 'make' == 1
-        end,
-      },
-      { 'nvim-telescope/telescope-ui-select.nvim' },
-
-      -- Useful for getting pretty icons, but requires a Nerd Font.
-      { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
-    },
-    config = function()
-      -- Telescope is a fuzzy finder that comes with a lot of different things that
-      -- it can fuzzy find! It's more than just a "file finder", it can search
-      -- many different aspects of Neovim, your workspace, LSP, and more!
-      --
-      -- The easiest way to use Telescope, is to start by doing something like:
-      --  :Telescope help_tags
-      --
-      -- After running this command, a window will open up and you're able to
-      -- type in the prompt window. You'll see a list of `help_tags` options and
-      -- a corresponding preview of the help.
-      --
-      -- Two important keymaps to use while in Telescope are:
-      --  - Insert mode: <c-/>
-      --  - Normal mode: ?
-      --
-      -- This opens a window that shows you all of the keymaps for the current
-      -- Telescope picker. This is really useful to discover what Telescope can
-      -- do as well as how to actually do it!
-
-      -- [[ Configure Telescope ]]
-      -- See `:help telescope` and `:help telescope.setup()`
-      require('telescope').setup {
-        -- You can put your default mappings / updates / etc. in here
-        --  All the info you're looking for is in `:help telescope.setup()`
-        --
-        -- defaults = {
-        --   mappings = {
-        --     i = { ['<c-enter>'] = 'to_fuzzy_refine' },
-        --   },
-        -- },
-        -- pickers = {}
-        extensions = {
-          ['ui-select'] = {
-            require('telescope.themes').get_dropdown(),
-          },
-        },
-      }
-
-      -- Enable Telescope extensions if they are installed
-      pcall(require('telescope').load_extension, 'fzf')
-      pcall(require('telescope').load_extension, 'ui-select')
-
-      -- See `:help telescope.builtin`
-      local builtin = require 'telescope.builtin'
-      vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
-      vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
-      vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
-      vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
-      vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
-      vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
-      vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
-      vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
-      vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
-      vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
-
-      -- Slightly advanced example of overriding default behavior and theme
-      vim.keymap.set('n', '<leader>/', function()
-        -- You can pass additional configuration to Telescope to change the theme, layout, etc.
-        builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-          winblend = 10,
-          previewer = false,
-        })
-      end, { desc = '[/] Fuzzily search in current buffer' })
-
-      -- It's also possible to pass additional configuration options.
-      --  See `:help telescope.builtin.live_grep()` for information about particular keys
-      vim.keymap.set('n', '<leader>s/', function()
-        builtin.live_grep {
-          grep_open_files = true,
-          prompt_title = 'Live Grep in Open Files',
-        }
-      end, { desc = '[S]earch [/] in Open Files' })
-
-      -- Shortcut for searching your Neovim configuration files
-      vim.keymap.set('n', '<leader>sn', function()
-        builtin.find_files { cwd = vim.fn.stdpath 'config' }
-      end, { desc = '[S]earch [N]eovim files' })
-    end,
-  },
-
-  { -- LSP Configuration & Plugins
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs and related tools to stdpath for Neovim
-      'williamboman/mason.nvim',
-      'williamboman/mason-lspconfig.nvim',
-      'WhoIsSethDaniel/mason-tool-installer.nvim',
-
-      -- Useful status updates for LSP.
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
-
-      -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
-      -- used for completion, annotations and signatures of Neovim apis
-      { 'folke/neodev.nvim', opts = {} },
-    },
-    config = function()
-      -- Brief aside: **What is LSP?**
-      --
-      -- LSP is an initialism you've probably heard, but might not understand what it is.
-      --
-      -- LSP stands for Language Server Protocol. It's a protocol that helps editors
-      -- and language tooling communicate in a standardized fashion.
-      --
-      -- In general, you have a "server" which is some tool built to understand a particular
-      -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
-      -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
-      -- processes that communicate with some "client" - in this case, Neovim!
-      --
-      -- LSP provides Neovim with features like:
-      --  - Go to definition
-      --  - Find references
-      --  - Autocompletion
-      --  - Symbol Search
-      --  - and more!
-      --
-      -- Thus, Language Servers are external tools that must be installed separately from
-      -- Neovim. This is where `mason` and related plugins come into play.
-      --
-      -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
-      -- and elegantly composed help section, `:help lsp-vs-treesitter`
-
-      --  This function gets run when an LSP attaches to a particular buffer.
-      --    That is to say, every time a new file is opened that is associated with
-      --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
-      --    function will be executed to configure the current buffer
-      vim.api.nvim_create_autocmd('LspAttach', {
-        group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-        callback = function(event)
-          -- NOTE: Remember that Lua is a real programming language, and as such it is possible
-          -- to define small helper and utility functions so you don't have to repeat yourself.
-          --
-          -- In this case, we create a function that lets us more easily define mappings specific
-          -- for LSP related items. It sets the mode, buffer and description for us each time.
-          local map = function(keys, func, desc)
-            vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
-          end
-
-          -- Jump to the definition of the word under your cursor.
-          --  This is where a variable was first declared, or where a function is defined, etc.
-          --  To jump back, press <C-t>.
-          map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-
-          -- Find references for the word under your cursor.
-          map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-
-          -- Jump to the implementation of the word under your cursor.
-          --  Useful when your language has ways of declaring types without an actual implementation.
-          map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-
-          -- Jump to the type of the word under your cursor.
-          --  Useful when you're not sure what type a variable is and you want to see
-          --  the definition of its *type*, not where it was *defined*.
-          map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-
-          -- Fuzzy find all the symbols in your current document.
-          --  Symbols are things like variables, functions, types, etc.
-          map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-
-          -- Fuzzy find all the symbols in your current workspace.
-          --  Similar to document symbols, except searches over your entire project.
-          map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
-          -- Rename the variable under your cursor.
-          --  Most Language Servers support renaming across files, etc.
-          map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-
-          -- Execute a code action, usually your cursor needs to be on top of an error
-          -- or a suggestion from your LSP for this to activate.
-          map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
-          -- Opens a popup that displays documentation about the word under your cursor
-          --  See `:help K` for why this keymap.
-          map('K', vim.lsp.buf.hover, 'Hover Documentation')
-
-          -- WARN: This is not Goto Definition, this is Goto Declaration.
-          --  For example, in C this would take you to the header.
-          map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-
-          -- The following two autocommands are used to highlight references of the
-          -- word under your cursor when your cursor rests there for a little while.
-          --    See `:help CursorHold` for information about when this is executed
-          --
-          -- When you move your cursor, the highlights will be cleared (the second autocommand).
-          local client = vim.lsp.get_client_by_id(event.data.client_id)
-          if client and client.server_capabilities.documentHighlightProvider then
-            vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
-              buffer = event.buf,
-              callback = vim.lsp.buf.document_highlight,
-            })
-
-            vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-              buffer = event.buf,
-              callback = vim.lsp.buf.clear_references,
-            })
-          end
-        end,
-      })
-
-      -- LSP servers and clients are able to communicate to each other what features they support.
-      --  By default, Neovim doesn't support everything that is in the LSP specification.
-      --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-      --  So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
-      local capabilities = vim.lsp.protocol.make_client_capabilities()
-      capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
-
-      -- Enable the following language servers
-      --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-      --
-      --  Add any additional override configuration in the following tables. Available keys are:
-      --  - cmd (table): Override the default command used to start the server
-      --  - filetypes (table): Override the default list of associated filetypes for the server
-      --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-      --  - settings (table): Override the default settings passed when initializing the server.
-      --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
-      local servers = {
-        -- clangd = {},
-        -- gopls = {},
-        -- pyright = {},
-        -- rust_analyzer = {},
-        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-        --
-        -- Some languages (like typescript) have entire language plugins that can be useful:
-        --    https://github.com/pmizio/typescript-tools.nvim
-        --
-        -- But for many setups, the LSP (`tsserver`) will work just fine
-        -- tsserver = {},
-        --
-
-        lua_ls = {
-          -- cmd = {...},
-          -- filetypes = { ...},
-          -- capabilities = {},
-          settings = {
-            Lua = {
-              completion = {
-                callSnippet = 'Replace',
-              },
-              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-              -- diagnostics = { disable = { 'missing-fields' } },
-            },
-          },
-        },
-      }
-
-      -- Ensure the servers and tools above are installed
-      --  To check the current status of installed tools and/or manually install
-      --  other tools, you can run
-      --    :Mason
-      --
-      --  You can press `g?` for help in this menu.
-      require('mason').setup()
-
-      -- You can add other tools here that you want Mason to install
-      -- for you, so that they are available from within Neovim.
-      local ensure_installed = vim.tbl_keys(servers or {})
-      vim.list_extend(ensure_installed, {
-        'stylua', -- Used to format Lua code
-      })
-      require('mason-tool-installer').setup { ensure_installed = ensure_installed }
-
-      require('mason-lspconfig').setup {
-        handlers = {
-          function(server_name)
-            local server = servers[server_name] or {}
-            -- This handles overriding only values explicitly passed
-            -- by the server configuration above. Useful when disabling
-            -- certain features of an LSP (for example, turning off formatting for tsserver)
-            server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-            require('lspconfig')[server_name].setup(server)
-          end,
-        },
-      }
-    end,
-  },
-
-  { -- Autoformat
-    'stevearc/conform.nvim',
-    lazy = false,
-    keys = {
-      {
-        '<leader>f',
-        function()
-          require('conform').format { async = true, lsp_fallback = true }
-        end,
-        mode = '',
-        desc = '[F]ormat buffer',
-      },
-    },
-    opts = {
-      notify_on_error = false,
-      format_on_save = function(bufnr)
-        -- Disable "format_on_save lsp_fallback" for languages that don't
-        -- have a well standardized coding style. You can add additional
-        -- languages here or re-enable it for the disabled ones.
-        local disable_filetypes = { c = true, cpp = true }
-        return {
-          timeout_ms = 500,
-          lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
-        }
-      end,
-      formatters_by_ft = {
-        lua = { 'stylua' },
-        -- Conform can also run multiple formatters sequentially
-        -- python = { "isort", "black" },
-        --
-        -- You can use a sub-list to tell conform to run *until* a formatter
-        -- is found.
-        -- javascript = { { "prettierd", "prettier" } },
-      },
-    },
-  },
-
-  { -- Autocompletion
-    'hrsh7th/nvim-cmp',
-    event = 'InsertEnter',
-    dependencies = {
-      -- Snippet Engine & its associated nvim-cmp source
-      {
-        'L3MON4D3/LuaSnip',
-        build = (function()
-          -- Build Step is needed for regex support in snippets.
-          -- This step is not supported in many windows environments.
-          -- Remove the below condition to re-enable on windows.
-          if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
-            return
-          end
-          return 'make install_jsregexp'
-        end)(),
-        dependencies = {
-          -- `friendly-snippets` contains a variety of premade snippets.
-          --    See the README about individual language/framework/plugin snippets:
-          --    https://github.com/rafamadriz/friendly-snippets
-          -- {
-          --   'rafamadriz/friendly-snippets',
-          --   config = function()
-          --     require('luasnip.loaders.from_vscode').lazy_load()
-          --   end,
-          -- },
-        },
-      },
-      'saadparwaiz1/cmp_luasnip',
-
-      -- Adds other completion capabilities.
-      --  nvim-cmp does not ship with all sources by default. They are split
-      --  into multiple repos for maintenance purposes.
-      'hrsh7th/cmp-nvim-lsp',
-      'hrsh7th/cmp-path',
-    },
-    config = function()
-      -- See `:help cmp`
-      local cmp = require 'cmp'
-      local luasnip = require 'luasnip'
-      luasnip.config.setup {}
-
-      cmp.setup {
-        snippet = {
-          expand = function(args)
-            luasnip.lsp_expand(args.body)
-          end,
-        },
-        completion = { completeopt = 'menu,menuone,noinsert' },
-
-        -- For an understanding of why these mappings were
-        -- chosen, you will need to read `:help ins-completion`
-        --
-        -- No, but seriously. Please read `:help ins-completion`, it is really good!
-        mapping = cmp.mapping.preset.insert {
-          -- Select the [n]ext item
-          ['<C-n>'] = cmp.mapping.select_next_item(),
-          -- Select the [p]revious item
-          ['<C-p>'] = cmp.mapping.select_prev_item(),
-
-          -- Scroll the documentation window [b]ack / [f]orward
-          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-
-          -- Accept ([y]es) the completion.
-          --  This will auto-import if your LSP supports it.
-          --  This will expand snippets if the LSP sent a snippet.
-          ['<C-y>'] = cmp.mapping.confirm { select = true },
-
-          -- Manually trigger a completion from nvim-cmp.
-          --  Generally you don't need this, because nvim-cmp will display
-          --  completions whenever it has completion options available.
-          ['<C-Space>'] = cmp.mapping.complete {},
-
-          -- Think of <c-l> as moving to the right of your snippet expansion.
-          --  So if you have a snippet that's like:
-          --  function $name($args)
-          --    $body
-          --  end
-          --
-          -- <c-l> will move you to the right of each of the expansion locations.
-          -- <c-h> is similar, except moving you backwards.
-          ['<C-l>'] = cmp.mapping(function()
-            if luasnip.expand_or_locally_jumpable() then
-              luasnip.expand_or_jump()
-            end
-          end, { 'i', 's' }),
-          ['<C-h>'] = cmp.mapping(function()
-            if luasnip.locally_jumpable(-1) then
-              luasnip.jump(-1)
-            end
-          end, { 'i', 's' }),
-
-          -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-          --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
-        },
-        sources = {
-          { name = 'nvim_lsp' },
-          { name = 'luasnip' },
-          { name = 'path' },
-        },
-      }
-    end,
-  },
-
-  { -- You can easily change to a different colorscheme.
-    -- Change the name of the colorscheme plugin below, and then
-    -- change the command in the config to whatever the name of that colorscheme is.
-    --
-    -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
-    'folke/tokyonight.nvim',
-    priority = 1000, -- Make sure to load this before all the other start plugins.
-    init = function()
-      -- Load the colorscheme here.
-      -- Like many other themes, this one has different styles, and you could load
-      -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
-      vim.cmd.colorscheme 'tokyonight-night'
-
-      -- You can configure highlights by doing something like:
-      vim.cmd.hi 'Comment gui=none'
-    end,
-  },
-
-  -- Highlight todo, notes, etc in comments
-  { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
-
-  { -- Collection of various small independent plugins/modules
-    'echasnovski/mini.nvim',
-    config = function()
-      -- Better Around/Inside textobjects
-      --
-      -- Examples:
-      --  - va)  - [V]isually select [A]round [)]paren
-      --  - yinq - [Y]ank [I]nside [N]ext [']quote
-      --  - ci'  - [C]hange [I]nside [']quote
-      require('mini.ai').setup { n_lines = 500 }
-
-      -- Add/delete/replace surroundings (brackets, quotes, etc.)
-      --
-      -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-      -- - sd'   - [S]urround [D]elete [']quotes
-      -- - sr)'  - [S]urround [R]eplace [)] [']
-      require('mini.surround').setup()
-
-      -- Simple and easy statusline.
-      --  You could remove this setup call if you don't like it,
-      --  and try some other statusline plugin
-      local statusline = require 'mini.statusline'
-      -- set use_icons to true if you have a Nerd Font
-      statusline.setup { use_icons = vim.g.have_nerd_font }
-
-      -- You can configure sections in the statusline by overriding their
-      -- default behavior. For example, here we set the section for
-      -- cursor location to LINE:COLUMN
-      ---@diagnostic disable-next-line: duplicate-set-field
-      statusline.section_location = function()
-        return '%2l:%-2v'
-      end
-
-      -- ... and there is more!
-      --  Check out: https://github.com/echasnovski/mini.nvim
-    end,
-  },
-  { -- Highlight, edit, and navigate code
-    'nvim-treesitter/nvim-treesitter',
-    build = ':TSUpdate',
-    opts = {
-      ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
-      -- Autoinstall languages that are not installed
-      auto_install = true,
-      highlight = {
-        enable = true,
-        -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
-        --  If you are experiencing weird indenting issues, add the language to
-        --  the list of additional_vim_regex_highlighting and disabled languages for indent.
-        additional_vim_regex_highlighting = { 'ruby' },
-      },
-      indent = { enable = true, disable = { 'ruby' } },
-    },
-    config = function(_, opts)
-      -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
-
-      ---@diagnostic disable-next-line: missing-fields
-      require('nvim-treesitter.configs').setup(opts)
-
-      -- There are additional nvim-treesitter modules that you can use to interact
-      -- with nvim-treesitter. You should go explore a few and see what interests you:
-      --
-      --    - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
-      --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
-      --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
-    end,
-  },
-
-  -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
-  -- init.lua. If you want these files, they are in the repository, so you can just download them and
-  -- place them in the correct locations.
-
-  -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
-  --
-  --  Here are some example plugins that I've included in the Kickstart repository.
-  --  Uncomment any of the lines below to enable them (you will need to restart nvim).
-  --
-  -- require 'kickstart.plugins.debug',
-  -- require 'kickstart.plugins.indent_line',
-  -- require 'kickstart.plugins.lint',
-
-  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-  --    This is the easiest way to modularize your config.
-  --
-  --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-  -- { import = 'custom.plugins' },
-}, {
+local opts = {
   ui = {
-    -- If you are using a Nerd Font: set icons to an empty table which will use the
-    -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
     icons = vim.g.have_nerd_font and {} or {
       cmd = '⌘',
       config = '🛠',
@@ -885,8 +252,13 @@ require('lazy').setup({
       task = '📌',
       lazy = '💤 ',
     },
+    checker = {
+      enabled = true,
+    },
   },
-})
+}
+
+require('lazy').setup('plugins', opts)
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/custom/plugins/indent_line.bak b/lua/custom/plugins/indent_line.bak
deleted file mode 100644
index ed7f2693..00000000
--- a/lua/custom/plugins/indent_line.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-  { -- Add indentation guides even on blank lines
-    'lukas-reineke/indent-blankline.nvim',
-    -- Enable `lukas-reineke/indent-blankline.nvim`
-    -- See `:help ibl`
-    main = 'ibl',
-    opts = {},
-  },
-}
diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua
deleted file mode 100644
index 232b01cc..00000000
--- a/lua/custom/plugins/lualine.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-return {
-  {
-    'nvim-lualine/lualine.nvim',
-    dependencies = {
-      { 'nvim-tree/nvim-web-devicons' },
-      { 'folke/noice.nvim' },
-    },
-    config = function(_, opts)
-      local noice = require 'noice'
-      require('lualine').setup {
-        options = {
-          theme = 'catppuccin',
-          component_separators = '',
-          section_separators = { left = '', right = '' },
-        },
-        sections = {
-          lualine_a = { { 'mode', separator = { left = '' } } },
-          lualine_x = {
-            {
-              noice.api.status.message.get_hl,
-              cond = noice.api.status.message.has,
-            },
-            {
-              noice.api.status.command.get,
-              cond = noice.api.status.command.has,
-              color = { fg = '#ff9e64' },
-            },
-            {
-              noice.api.status.mode.get,
-              cond = noice.api.status.mode.has,
-              color = { fg = '#ff9e64' },
-            },
-            {
-              noice.api.status.search.get,
-              cond = noice.api.status.search.has,
-              color = { fg = '#ff9e64' },
-            },
-          },
-          lualine_z = {
-            {
-              'location',
-              separator = { right = '' },
-              left_padding = 2,
-            },
-          },
-        },
-        extensions = {
-          'oil',
-          'lazy',
-        },
-      }
-    end,
-  },
-}
diff --git a/lua/custom/plugins/neodev.lua b/lua/custom/plugins/neodev.lua
deleted file mode 100644
index d9c06858..00000000
--- a/lua/custom/plugins/neodev.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
--- used for completion, annotations and signatures of Neovim apis
-return {
-  {
-    'folke/neodev.nvim',
-    opts = {
-      override = function(root_dir, library)
-        if root_dir:find '.config/nvim' then
-          library.enabled = true
-          library.plugins = true
-        end
-      end,
-    },
-  },
-}
diff --git a/lua/custom/plugins/autopair.lua b/lua/plugins/autopair.lua
similarity index 100%
rename from lua/custom/plugins/autopair.lua
rename to lua/plugins/autopair.lua
diff --git a/lua/custom/plugins/conform.lua b/lua/plugins/conform.lua
similarity index 87%
rename from lua/custom/plugins/conform.lua
rename to lua/plugins/conform.lua
index da230df4..c583316a 100644
--- a/lua/custom/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -5,7 +5,7 @@ return {
     cmd = { 'ConformInfo' },
     keys = {
       {
-        '<C>f',
+        '<leader>f',
         function()
           require('conform').format { async = true, lsp_fallback = true }
         end,
@@ -21,7 +21,8 @@ return {
         typescript = { 'prettier' },
       },
       format_on_save = function(bufnr)
-        local disable_filetypes = {--[[  c = true, cpp = true  ]]
+        local disable_filetypes = {
+          --[[  c = true, cpp = true  ]]
         }
         return {
           timeout_ms = 500,
diff --git a/lua/custom/plugins/dashboard.lua b/lua/plugins/dashboard.lua
similarity index 100%
rename from lua/custom/plugins/dashboard.lua
rename to lua/plugins/dashboard.lua
diff --git a/lua/custom/plugins/fidget.lua b/lua/plugins/fidget.lua
similarity index 100%
rename from lua/custom/plugins/fidget.lua
rename to lua/plugins/fidget.lua
diff --git a/lua/custom/plugins/git-signs.lua b/lua/plugins/git-signs.lua
similarity index 100%
rename from lua/custom/plugins/git-signs.lua
rename to lua/plugins/git-signs.lua
diff --git a/lua/custom/plugins/highlight-action.lua b/lua/plugins/highlight-action.lua
similarity index 100%
rename from lua/custom/plugins/highlight-action.lua
rename to lua/plugins/highlight-action.lua
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
new file mode 100644
index 00000000..d8ac6e91
--- /dev/null
+++ b/lua/plugins/init.lua
@@ -0,0 +1,43 @@
+return {
+  {
+    'catppuccin/nvim',
+    lazy = false,
+    name = 'catppuccin',
+    priority = 1000,
+    init = function()
+      vim.cmd.colorscheme 'catppuccin-mocha'
+      -- You can configure highlights by doing something like:
+      vim.cmd.hi 'Comment gui=none'
+    end,
+    opts = {
+      integrations = {
+        cmp = true,
+        gitsigns = true,
+        treesitter = true,
+        notify = true,
+        mini = {
+          enabled = true,
+        },
+        dashboard = true,
+        fidget = true,
+        mason = true,
+        telescope = {
+          enabled = true,
+        },
+        which_key = true,
+      },
+    },
+  },
+  { 'tpope/vim-sleuth' },
+  {
+    'lukas-reineke/indent-blankline.nvim',
+    main = 'ibl',
+    opts = {
+      exclude = {
+        filetypes = {
+          'dashboard',
+        },
+      },
+    },
+  },
+}
diff --git a/lua/custom/plugins/lint.lua b/lua/plugins/lint.lua
similarity index 86%
rename from lua/custom/plugins/lint.lua
rename to lua/plugins/lint.lua
index b59b30db..66a74f1f 100644
--- a/lua/custom/plugins/lint.lua
+++ b/lua/plugins/lint.lua
@@ -3,8 +3,8 @@ return {
     'mfussenegger/nvim-lint',
     init = function()
       require('lint').linters_by_ft = {
-        javascript = { 'quick-lint-js' },
-        typescript = { 'quick-lint-js' },
+        javascript = { 'eslint_d' },
+        typescript = { 'eslint_d' },
         json = { 'jsonlint' },
         lua = { 'luacheck' },
         go = { 'revive' },
diff --git a/lua/custom/plugins/lsp-signature.lua b/lua/plugins/lsp-signature.lua
similarity index 100%
rename from lua/custom/plugins/lsp-signature.lua
rename to lua/plugins/lsp-signature.lua
diff --git a/lua/custom/plugins/lsp.lua b/lua/plugins/lsp.lua
similarity index 66%
rename from lua/custom/plugins/lsp.lua
rename to lua/plugins/lsp.lua
index f3e899b7..cd6a4073 100644
--- a/lua/custom/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -2,16 +2,16 @@ return {
   {
     'neovim/nvim-lspconfig',
     dependencies = {
-      -- Automatically install LSPs and related tools to stdpath for Neovim
       'williamboman/mason.nvim',
       'williamboman/mason-lspconfig.nvim',
       'WhoIsSethDaniel/mason-tool-installer.nvim',
-
+      'folke/neodev.nvim',
       { 'j-hui/fidget.nvim' },
-      { 'folke/neodev.nvim' },
     },
-    init = function() end,
     config = function()
+      require 'plugins.neodev'
+      require('neoconf').setup {}
+
       --    function will be executed to configure the current buffer
       vim.api.nvim_create_autocmd('LspAttach', {
         group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
@@ -40,65 +40,49 @@ return {
       capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
       capabilities.textDocument.completion.completionItem.snippetSupport = true
 
+      local lazyPlugins = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
       local servers = {
-        -- clangd = {},
-        -- gopls = {},
-        -- pyright = {},
-        -- rust_analyzer = {},
-        -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-        --
-        -- Some languages (like typescript) have entire language plugins that can be useful:
-        --    https://github.com/pmizio/typescript-tools.nvim
-        --
-        -- But for many setups, the LSP (`tsserver`) will work just fine
         biome = {},
         tsserver = {},
         lua_ls = {
-          -- cmd = {...},
-          -- filetypes = { ...},
-          -- capabilities = {},
           settings = {
-            Lua = {
+            lua = {
               runtime = {
-                -- Tell the language server which version of Lua you're using
-                -- (most likely LuaJIT in the case of Neovim)
                 version = 'LuaJIT',
               },
-              -- Make the server aware of Neovim runtime files
               workspace = {
-                checkThirdParty = true,
+                checkthirdparty = { lazyPlugins },
+
                 library = {
                   vim.env.VIMRUNTIME,
-                  -- Depending on the usage, you might want to add additional paths here.
-                  -- "${3rd}/luv/library"
-                  -- "${3rd}/busted/library",
+                  --   -- depending on the usage, you might want to add additional paths here.
+                  --   -- "${3rd}/luv/library"
+                  --   -- "${3rd}/busted/library",
+                  -- },
+                  -- or pull in all of 'runtimepath'. note: this is a lot slower
                 },
-                -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-                library = vim.api.nvim_get_runtime_file('', true),
+                -- library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { vim.env.VIMRUNTIME }),
               },
-
               completion = {
                 callSnippet = 'Replace',
               },
               -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-              -- diagnostics = { disable = { 'missing-f.ields' } },
+              diagnostics = {
+                disable = { 'missing-fields' },
+                globals = { 'vim' },
+              },
             },
           },
         },
         jsonls = {},
         yamlls = {},
-        revive = {},
       }
 
       --  You can press `g?` for help in this menu.
       require('mason').setup()
 
-      -- You can add other tools here that you want Mason to install
-      -- for you, so that they are available from within Neovim.
       local ensure_installed = vim.tbl_keys(servers or {})
-      vim.list_extend(ensure_installed, {
-        'stylua', -- Used to format Lua code
-      })
+      vim.list_extend(ensure_installed, { 'stylua' })
       require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
       require('mason-lspconfig').setup {
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 00000000..090c168c
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,84 @@
+return {
+  {
+    'nvim-lualine/lualine.nvim',
+    dependencies = {
+      { 'nvim-tree/nvim-web-devicons' },
+      { 'folke/noice.nvim' },
+    },
+    config = function()
+      local noice = require 'noice'
+
+      require('lualine').setup {
+        options = {
+          theme = 'catppuccin',
+          component_separators = '',
+          section_separators = { left = '', right = '' },
+        },
+        sections = {
+          lualine_a = {
+            {
+              'mode',
+              separator = { left = '' },
+              fmt = function(_, context)
+                local winnr = vim.fn.tabpagewinnr(context.tabnr)
+                local ok, val = pcall(vim.api.nvim_win_get_var, winnr, 'nnn')
+                if ok and val then
+                  return 'nnn'
+                end
+              end,
+              color = function(section)
+                local winnr = vim.api.nvim_get_current_win()
+                local ok, val = pcall(vim.api.nvim_win_get_var, winnr, 'nnn')
+                if ok and val then
+                  return { fg = '#054fca' }
+                end
+                return {}
+              end,
+            },
+          },
+          lualine_x = {
+            {
+              noice.api.status.message.get_hl,
+              cond = noice.api.status.message.has,
+            },
+            {
+              noice.api.status.command.get_hl,
+              cond = noice.api.status.command.has,
+              color = { fg = '#ff0000' },
+            },
+            {
+              noice.api.status.mode.get,
+              cond = noice.api.status.mode.has,
+              color = { fg = '#00ff00' },
+            },
+          },
+          lualine_z = {
+            {
+              'location',
+              separator = { right = '' },
+              left_padding = 2,
+            },
+          },
+        },
+        extensions = {
+          'oil',
+          'lazy',
+        },
+      }
+
+      --      vim.api.nvim_create_autocmd({ 'BufEnter' }, {
+      --        callback = function(ev)
+      --          local filetype = vim.api.nvim_get_option_value('filetype', { buf = ev.buf })
+      --
+      --          print(string.format('event fired: %s', filetype))
+      --          if filetype == 'oil' then
+      --            local ok, value = pcall(vim.api.nvim_buf_get_var, ev.buf, 'nnn')
+      --            if not ok then
+      --              vim.api.nvim_buf_set_var(ev.buf, 'nnn', true)
+      --            end
+      --          end
+      --        end,
+      --      })
+    end,
+  },
+}
diff --git a/lua/custom/plugins/mini.lua b/lua/plugins/mini.lua
similarity index 100%
rename from lua/custom/plugins/mini.lua
rename to lua/plugins/mini.lua
diff --git a/lua/plugins/neoconf.lua b/lua/plugins/neoconf.lua
new file mode 100644
index 00000000..56b64169
--- /dev/null
+++ b/lua/plugins/neoconf.lua
@@ -0,0 +1,6 @@
+return {
+  {
+    'folke/neoconf.nvim',
+    opts = {},
+  },
+}
diff --git a/lua/plugins/neodev.lua b/lua/plugins/neodev.lua
new file mode 100644
index 00000000..7e8fc97a
--- /dev/null
+++ b/lua/plugins/neodev.lua
@@ -0,0 +1,17 @@
+return {
+  {
+    'folke/neodev.nvim',
+    opts = {
+      library = {
+        enabled = true,
+        runtime = true,
+        types = true,
+        plugins = true,
+        -- plugins = { "nvim-treesitter", "plenary.nvim", "telescope.nvim" },
+      },
+      setup_jsonls = true,
+      lspconfig = true,
+      pathStrict = true,
+    },
+  },
+}
diff --git a/lua/custom/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua
similarity index 92%
rename from lua/custom/plugins/nvim-cmp.lua
rename to lua/plugins/nvim-cmp.lua
index 3aa319bf..4f2c0158 100644
--- a/lua/custom/plugins/nvim-cmp.lua
+++ b/lua/plugins/nvim-cmp.lua
@@ -40,7 +40,7 @@ return {
         completion = { completeopt = 'menu,menuone,noinsert' },
 
         -- For an understanding of why these mappings were
-        -- chosen, you will need to read `:help ins-completion`
+        -- chosen, you will need to reaźd `:help ins-completion`
         --
         -- No, but seriously. Please read `:help ins-completion`, it is really good!
         mapping = cmp.mapping.preset.insert {
@@ -71,12 +71,12 @@ return {
           --
           -- <c-l> will move you to the right of each of the expansion locations.
           -- <c-h> is similar, except moving you backwards.
-          ['<C-l>'] = cmp.mapping(function()
+          ['<Tab>'] = cmp.mapping(function()
             if luasnip.expand_or_locally_jumpable() then
               luasnip.expand_or_jump()
             end
           end, { 'i', 's' }),
-          ['<C-h>'] = cmp.mapping(function()
+          ['<S-Tab>'] = cmp.mapping(function()
             if luasnip.locally_jumpable(-1) then
               luasnip.jump(-1)
             end
@@ -86,9 +86,11 @@ return {
           --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
         },
         sources = cmp.config.sources({
+          { name = 'nvim_lsp_signature_help' },
           { name = 'nvim_lsp' },
           { name = 'luasnip' },
           { name = 'path' },
+          { name = 'nvim_lua' },
         }, {
           { name = 'buffer' },
         }),
diff --git a/lua/custom/plugins/nvim-notify.lua b/lua/plugins/nvim-notify.lua
similarity index 100%
rename from lua/custom/plugins/nvim-notify.lua
rename to lua/plugins/nvim-notify.lua
diff --git a/lua/custom/plugins/nvim-treesitter.lua b/lua/plugins/nvim-treesitter.lua
similarity index 91%
rename from lua/custom/plugins/nvim-treesitter.lua
rename to lua/plugins/nvim-treesitter.lua
index fd5fa0fe..3072f641 100644
--- a/lua/custom/plugins/nvim-treesitter.lua
+++ b/lua/plugins/nvim-treesitter.lua
@@ -3,7 +3,8 @@ return {
     'nvim-treesitter/nvim-treesitter',
     build = ':TSUpdate',
     opts = {
-      ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc', 'javascript', 'typescript' },
+
+      ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' },
       auto_install = true,
       highlight = {
         enable = true,
diff --git a/lua/custom/plugins/oil.lua b/lua/plugins/oil.lua
similarity index 100%
rename from lua/custom/plugins/oil.lua
rename to lua/plugins/oil.lua
diff --git a/lua/custom/plugins/schemastore.lua b/lua/plugins/schemastore.lua
similarity index 59%
rename from lua/custom/plugins/schemastore.lua
rename to lua/plugins/schemastore.lua
index a056620a..ed6f4282 100644
--- a/lua/custom/plugins/schemastore.lua
+++ b/lua/plugins/schemastore.lua
@@ -1,24 +1,26 @@
 return {
   {
     'b0o/schemastore.nvim',
-    depenencies = {
+    dependencies = {
       { 'neovim/nvim-lspconfig' },
     },
     config = function()
-      require('lspconfig').jsonls.setup {
+      local schemastore = require 'schemastore'
+      local lspconfig = require 'lspconfig'
+      lspconfig.jsonls.setup {
         settigns = {
           json = {
-            schemas = require('schemastore').json.schemas(),
+            schemas = schemastore.json.schemas(),
             validate = {
               enable = true,
             },
           },
         },
       }
-      require('lspconfig').yamlls.setup {
+      lspconfig.yamlls.setup {
         settigns = {
           yaml = {
-            schemas = require('schemastore').yaml.schemas(),
+            schemas = schemastore.yaml.schemas(),
           },
           schemaStore = {
             enable = true,
diff --git a/lua/custom/plugins/suda.lua b/lua/plugins/suda.lua
similarity index 100%
rename from lua/custom/plugins/suda.lua
rename to lua/plugins/suda.lua
diff --git a/lua/custom/plugins/tabline.lua b/lua/plugins/tabline.lua
similarity index 100%
rename from lua/custom/plugins/tabline.lua
rename to lua/plugins/tabline.lua
diff --git a/lua/custom/plugins/telescope.lua b/lua/plugins/telescope.lua
similarity index 98%
rename from lua/custom/plugins/telescope.lua
rename to lua/plugins/telescope.lua
index 1055dd2b..0b40d2bf 100644
--- a/lua/custom/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -20,8 +20,6 @@ return {
       },
       { 'nvim-telescope/telescope-ui-select.nvim' },
       { 'debugloop/telescope-undo.nvim' },
-
-      -- Useful for getting pretty icons, but requires a Nerd Font.
       { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
     },
     config = function()
diff --git a/lua/custom/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua
similarity index 100%
rename from lua/custom/plugins/todo-comments.lua
rename to lua/plugins/todo-comments.lua
diff --git a/lua/custom/plugins/undotree.lua b/lua/plugins/undotree.lua
similarity index 100%
rename from lua/custom/plugins/undotree.lua
rename to lua/plugins/undotree.lua
diff --git a/lua/custom/plugins/wayland-noice.lua b/lua/plugins/wayland-noice.lua
similarity index 61%
rename from lua/custom/plugins/wayland-noice.lua
rename to lua/plugins/wayland-noice.lua
index 16eef717..4082529e 100644
--- a/lua/custom/plugins/wayland-noice.lua
+++ b/lua/plugins/wayland-noice.lua
@@ -20,15 +20,18 @@ return {
       presets = {
         bottom_search = true,
         command_palette = true,
-        lsp_doc_border = true,
+        lsp_doc_border = false,
         long_message_to_split = true,
         inc_rename = true,
       },
       views = {
+        split = {
+          enter = true,
+        },
         cmdline_popup = {
           border = {
             style = 'none',
-            padding = { 2, 3 },
+            padding = { 2, 1 },
           },
           filter_options = {},
           win_options = {
@@ -44,22 +47,47 @@ return {
           win_options = {
             winhighlight = 'NormalFloat:NormalFloat,FloatBorder:FloatBorder',
           },
+          virtualtext = {
+            hl_group = 'Search',
+          },
         },
       },
       routes = {
+        --        {
+        --          filter = {
+        --            event = 'msg_show',
+        --            kind = 'search_count',
+        --          },
+        --          opts = {
+        --            skip = true,
+        --          },
+        --        },
         {
-          view = 'notify',
-          filter = { event = 'msg_showmode' },
+          view = 'split',
+          filter = {
+            event = { 'msg_show', 'noice' },
+            min_height = 20,
+          },
         },
       },
+      messages = {
+        enabled = true,
+        view = 'notify',
+        view_error = 'notify',
+        view_warn = 'notify',
+        view_history = 'messages',
+        view_search = 'virtualtext',
+        opts = {},
+      },
       notify = {
         enabled = true,
         view = 'notify',
       },
-      messages = {
-        enabled = true,
-        view = 'notify',
-        opts = {},
+      commands = {
+        search = {
+          view = 'popup',
+          filter = { kind = 'search' },
+        },
       },
     },
   },
diff --git a/lua/custom/plugins/which-key.lua b/lua/plugins/which-key.lua
similarity index 100%
rename from lua/custom/plugins/which-key.lua
rename to lua/plugins/which-key.lua
diff --git a/neoconf.json b/neoconf.json
new file mode 100644
index 00000000..0690d1ad
--- /dev/null
+++ b/neoconf.json
@@ -0,0 +1,18 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": ["neoconf.nvim", "nvim-lspconfig"]
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  },
+  "lspconfig": {
+    "sumneko_lua": {}
+  }
+}
diff --git a/util.lua b/util.lua
new file mode 100644
index 00000000..c66e0ee4
--- /dev/null
+++ b/util.lua
@@ -0,0 +1,11 @@
+-- @return true | false | nil
+function get_oil_nnn(winnr)
+  local ok, value = pcall(vim.api.nvim_win_get_var, winnr, 'nnn')
+  if not ok then
+    return nil
+  end
+  if value then
+    return true
+  end
+  return false
+end