39 files changed, 150 insertions, 97 deletions
diff --git a/lua/alpha/disable_builtin.lua b/lua/alpha/disable_builtin.lua
deleted file mode 100644
index 6177c82..0000000
--- a/lua/alpha/disable_builtin.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-vim.g.loaded_gzip = 1
-vim.g.loaded_zip = 1
-vim.g.loaded_zipPlugin = 1
-vim.g.loaded_tar = 1
-vim.g.loaded_tarPlugin = 1
-
-vim.g.loaded_getscript = 1
-vim.g.loaded_getscriptPlugin = 1
-vim.g.loaded_vimball = 1
-vim.g.loaded_vimballPlugin = 1
-vim.g.loaded_2html_plugin = 1
-
-vim.g.loaded_matchit = 1
-vim.g.loaded_matchparen = 1
-vim.g.loaded_logiPat = 1
-vim.g.loaded_rrhelper = 1
-
--- vim.g.loaded_netrw = 1
--- vim.g.loaded_netrwPlugin = 1
--- vim.g.loaded_netrwSettings = 1
diff --git a/lua/alpha/lazy.lua b/lua/alpha/lazy.lua
deleted file mode 100644
index b878978..0000000
--- a/lua/alpha/lazy.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup("alpha.plugins")
diff --git a/lua/alpha/settings.lua b/lua/alpha/settings.lua
deleted file mode 100644
index 0d012f6..0000000
--- a/lua/alpha/settings.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-vim.g.mapleader = " "
-vim.g.snippets = "luasnip"
-
-vim.g.alpha_color = "tokyonight"
-vim.g.alpha_lualine_color = "tokyonight"
-
-local options = vim.o
-
-options.mouse = false
-options.number = true
-options.relativenumber = true
-
-options.hidden = true
-options.expandtab = true
-options.tabstop = 4
-options.softtabstop = 4
-options.shiftwidth = 4
-options.smartindent = true
-options.errorbells = false
-options.wrap = false
-options.swapfile = false
-options.undofile = true
-options.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir"
-options.hlsearch = false
-options.incsearch = true
-options.ignorecase = true
-options.smartcase = true
-options.termguicolors = true
-options.scrolloff = 4
-options.sidescrolloff = 4
-options.showmode = false
-options.clipboard = "unnamedplus"
-options.splitbelow = true
-options.splitright = true
-options.autowrite = true
-options.list = true
-options.listchars = "tab:\\ ,trail:-"
-options.laststatus = 3
-options.cmdheight = 1
-options.updatetime = 50
-options.signcolumn = "yes"
diff --git a/lua/alpha/telescope/actions.lua b/lua/alpha/telescope/actions.lua
index e877b34..f996cf4 100644
--- a/lua/alpha/telescope/actions.lua
+++ b/lua/alpha/telescope/actions.lua
@@ -2,12 +2,11 @@ local M = {}
 
 local action_state = require("telescope.actions.state")
 local actions = require("telescope.actions")
-local get_node_text = vim.treesitter.get_node_text
 
 M.create_plugin = function(prompt_bufnr)
     local new_plugin = action_state.get_current_line()
     actions.close(prompt_bufnr)
-    vim.cmd(string.format("edit ~/.config/nvim/lua/alpha/plugins/%s.lua", new_plugin))
+    vim.cmd(string.format("edit ~/.config/nvim/lua/plugins/%s.lua", new_plugin))
 end
 
 local get_disable_stm_node = function(bufnr, tree)
diff --git a/lua/alpha/telescope/init.lua b/lua/alpha/telescope/init.lua
index 40f3b7b..c717cb6 100644
--- a/lua/alpha/telescope/init.lua
+++ b/lua/alpha/telescope/init.lua
@@ -51,7 +51,7 @@ end
 M.find_nvim_plugin = function()
     require("telescope.builtin").find_files({
         prompt_title = "< Plugins >",
-        cwd = "$HOME/.config/nvim/lua/alpha/plugins/",
+        cwd = "$HOME/.config/nvim/lua/plugins/",
         attach_mappings = function(_, map)
             map("i", "<C-t>", my_actions.create_plugin)
             map("i", "<C-d>", my_actions.disable_plugin)
diff --git a/lua/alpha/utils.lua b/lua/alpha/utils.lua
index b1911bc..5279832 100644
--- a/lua/alpha/utils.lua
+++ b/lua/alpha/utils.lua
@@ -1,24 +1,24 @@
 local utils = {}
 
 utils.save_and_exec = function()
-	local source_commands = {
-		lua = "luafi %",
-		vim = "source %",
-	}
+    local source_commands = {
+        lua = "luafi %",
+        vim = "source %",
+    }
 
-	local ft = vim.api.nvim_buf_get_option(0, "filetype")
-	local command = source_commands[ft]
-	if command == nil then
-		vim.notify("This type cant not be sourced", vim.log.levels.ERROR)
-		return
-	end
+    local ft = vim.api.nvim_buf_get_option(0, "filetype")
+    local command = source_commands[ft]
+    if command == nil then
+        vim.notify("This type cant not be sourced", vim.log.levels.ERROR, { title = "Alpha Developer" })
+        return
+    end
 
-	-- Save and source
-	vim.api.nvim_command("silent w")
-	vim.api.nvim_command(command)
+    -- Save and source
+    vim.api.nvim_command("silent w")
+    vim.api.nvim_command(command)
 
-	local current_file_name = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), ":t")
-	vim.notify(string.format("File %s Sourced", current_file_name), vim.log.levels.INFO)
+    local current_file_name = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), ":t")
+    vim.notify(string.format("File %s Sourced", current_file_name), vim.log.levels.INFO, { title = "Alpha Developer" })
 end
 
 return utils
diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua
new file mode 100644
index 0000000..ee165ee
--- /dev/null
+++ b/lua/config/autocmds.lua
@@ -0,0 +1,39 @@
+-- resize splits if window got resized
+vim.api.nvim_create_autocmd({ "VimResized" }, {
+  callback = function()
+    vim.cmd("tabdo wincmd =")
+  end,
+})
+
+-- close some filetypes with <q>
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = {
+    "qf",
+    "help",
+    "man",
+    "notify",
+    "lspinfo",
+    "spectre_panel",
+    "startuptime",
+    "tsplayground",
+    "PlenaryTestPopup",
+  },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+    vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
+  end,
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "gitcommit", "markdown" },
+  callback = function()
+    vim.opt_local.wrap = true
+    vim.opt_local.spell = true
+  end,
+})
+
+vim.api.nvim_create_autocmd({"BufWritePre"}, {
+    callback = function ()
+        vim.cmd([[%s/\s\+$//e]])
+    end
+})
diff --git a/lua/alpha/diagnostic.lua b/lua/config/diagnostic.lua
index 543732f..7d56f1c 100644
--- a/lua/alpha/diagnostic.lua
+++ b/lua/config/diagnostic.lua
@@ -1,6 +1,3 @@
-vim.keymap.set("n", "<leader>vn", vim.diagnostic.goto_next, {})
-vim.keymap.set("n", "<leader>vp", vim.diagnostic.goto_prev, {})
-
 vim.diagnostic.config({
 	virtual_text = false,
 })
diff --git a/lua/config/init.lua b/lua/config/init.lua
new file mode 100644
index 0000000..3537ca6
--- /dev/null
+++ b/lua/config/init.lua
@@ -0,0 +1,14 @@
+require("config.options")
+require("config.lazy")
+if vim.fn.argc() == 0 then
+    -- autocmds and keymaps can wait to load
+    vim.api.nvim_create_autocmd("User", {
+        group = vim.api.nvim_create_augroup("LazyVim", { clear = true }),
+        pattern = "VeryLazy",
+        callback = function()
+            require("config.autocmds")
+            require("config.keymaps")
+            require("config.diagnostic")
+        end,
+    })
+end
diff --git a/lua/alpha/keybindings.lua b/lua/config/keymaps.lua
index ca4dd3a..95ad0d7 100644
--- a/lua/alpha/keybindings.lua
+++ b/lua/config/keymaps.lua
@@ -43,3 +43,6 @@ map("n", "<leader>ee", ":vsp .env<CR>")
 
 -- quick save and exec
 map("n", "<leader><leader>x", require("alpha.utils").save_and_exec)
+
+map("n", "<leader>vn", vim.diagnostic.goto_next, {})
+map("n", "<leader>vp", vim.diagnostic.goto_prev, {})
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
new file mode 100644
index 0000000..5c9351a
--- /dev/null
+++ b/lua/config/lazy.lua
@@ -0,0 +1,33 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+    vim.fn.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable", -- latest stable release
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+    spec = {
+        { import = "plugins" },
+    },
+    checker = { enabled = true },
+    performance = {
+        rtp = {
+            disabled_plugins = {
+                "gzip",
+                "matchit",
+                "matchparen",
+                "netrwPlugin",
+                "tarPlugin",
+                "tohtml",
+                "tutor",
+                "zipPlugin",
+            },
+        },
+    },
+})
diff --git a/lua/config/options.lua b/lua/config/options.lua
new file mode 100644
index 0000000..21b0c68
--- /dev/null
+++ b/lua/config/options.lua
@@ -0,0 +1,43 @@
+vim.g.mapleader = " "
+vim.g.snippets = "luasnip"
+
+local opt = vim.o
+
+opt.mouse = false
+opt.number = true
+opt.relativenumber = true
+opt.conceallevel = 3
+opt.hidden = true
+opt.expandtab = true
+opt.tabstop = 4
+opt.softtabstop = 4
+opt.shiftwidth = 4
+opt.smartindent = true
+opt.errorbells = false
+opt.wrap = false
+opt.swapfile = false
+opt.undofile = true
+opt.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir"
+opt.hlsearch = false
+opt.incsearch = true
+opt.ignorecase = true
+opt.smartcase = true
+opt.termguicolors = true
+opt.scrolloff = 4
+opt.sidescrolloff = 4
+opt.showmode = false
+opt.clipboard = "unnamedplus"
+opt.splitbelow = true
+opt.splitright = true
+opt.autowrite = true
+opt.list = true
+opt.listchars = "tab:\\ ,trail:-"
+opt.laststatus = 3
+opt.cmdheight = 1
+opt.updatetime = 50
+opt.signcolumn = "yes"
+
+if vim.fn.has("nvim-0.9.0") == 1 then
+  opt.splitkeep = "screen"
+  opt.shortmess = "filnxtToOFWIcC"
+end
diff --git a/lua/alpha/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 9f0528e..9f0528e 100644
--- a/lua/alpha/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
diff --git a/lua/alpha/plugins/comment.lua b/lua/plugins/comment.lua
index fd55eff..fd55eff 100644
--- a/lua/alpha/plugins/comment.lua
+++ b/lua/plugins/comment.lua
diff --git a/lua/alpha/plugins/completition.lua b/lua/plugins/completition.lua
index cf1a37d..cf1a37d 100644
--- a/lua/alpha/plugins/completition.lua
+++ b/lua/plugins/completition.lua
diff --git a/lua/alpha/plugins/dap.lua b/lua/plugins/dap.lua
index f8a7b17..f8a7b17 100644
--- a/lua/alpha/plugins/dap.lua
+++ b/lua/plugins/dap.lua
diff --git a/lua/alpha/plugins/database.lua b/lua/plugins/database.lua
index fceb506..fceb506 100644
--- a/lua/alpha/plugins/database.lua
+++ b/lua/plugins/database.lua
diff --git a/lua/alpha/plugins/dressing.lua b/lua/plugins/dressing.lua
index d7de41b..d7de41b 100644
--- a/lua/alpha/plugins/dressing.lua
+++ b/lua/plugins/dressing.lua
diff --git a/lua/alpha/plugins/easy-align.lua b/lua/plugins/easy-align.lua
index 5f62713..5f62713 100644
--- a/lua/alpha/plugins/easy-align.lua
+++ b/lua/plugins/easy-align.lua
diff --git a/lua/alpha/plugins/fugitive.lua b/lua/plugins/fugitive.lua
index ccce9b5..ccce9b5 100644
--- a/lua/alpha/plugins/fugitive.lua
+++ b/lua/plugins/fugitive.lua
diff --git a/lua/alpha/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
index 524da78..524da78 100644
--- a/lua/alpha/plugins/gitsigns.lua
+++ b/lua/plugins/gitsigns.lua
diff --git a/lua/alpha/plugins/harpoon.lua b/lua/plugins/harpoon.lua
index b410c8e..b410c8e 100644
--- a/lua/alpha/plugins/harpoon.lua
+++ b/lua/plugins/harpoon.lua
diff --git a/lua/alpha/plugins/icon-picker.lua b/lua/plugins/icon-picker.lua
index 55183db..55183db 100644
--- a/lua/alpha/plugins/icon-picker.lua
+++ b/lua/plugins/icon-picker.lua
diff --git a/lua/alpha/plugins/init.lua b/lua/plugins/init.lua
index b126f85..b126f85 100644
--- a/lua/alpha/plugins/init.lua
+++ b/lua/plugins/init.lua
diff --git a/lua/alpha/plugins/laravel.lua b/lua/plugins/laravel.lua
index 60f8ad2..60f8ad2 100644
--- a/lua/alpha/plugins/laravel.lua
+++ b/lua/plugins/laravel.lua
diff --git a/lua/alpha/plugins/lsp.lua b/lua/plugins/lsp.lua
index 8d5c36a..8d5c36a 100644
--- a/lua/alpha/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
diff --git a/lua/alpha/plugins/lualine.lua b/lua/plugins/lualine.lua
index f63efa0..f63efa0 100644
--- a/lua/alpha/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
diff --git a/lua/alpha/plugins/mind.lua b/lua/plugins/mind.lua
index 70c0e23..70c0e23 100644
--- a/lua/alpha/plugins/mind.lua
+++ b/lua/plugins/mind.lua
diff --git a/lua/alpha/plugins/neotest.lua b/lua/plugins/neotest.lua
index 5a332be..5a332be 100644
--- a/lua/alpha/plugins/neotest.lua
+++ b/lua/plugins/neotest.lua
diff --git a/lua/alpha/plugins/notify.lua b/lua/plugins/notify.lua
index 4b2a82c..4b2a82c 100644
--- a/lua/alpha/plugins/notify.lua
+++ b/lua/plugins/notify.lua
diff --git a/lua/alpha/plugins/refactoring.lua b/lua/plugins/refactoring.lua
index 349cc63..349cc63 100644
--- a/lua/alpha/plugins/refactoring.lua
+++ b/lua/plugins/refactoring.lua
diff --git a/lua/alpha/plugins/rest.lua b/lua/plugins/rest.lua
index 7b60a9d..7b60a9d 100644
--- a/lua/alpha/plugins/rest.lua
+++ b/lua/plugins/rest.lua
diff --git a/lua/alpha/plugins/snippets.lua b/lua/plugins/snippets.lua
index cba0dd1..cba0dd1 100644
--- a/lua/alpha/plugins/snippets.lua
+++ b/lua/plugins/snippets.lua
diff --git a/lua/alpha/plugins/telescope.lua b/lua/plugins/telescope.lua
index 52d7b8b..52d7b8b 100644
--- a/lua/alpha/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
diff --git a/lua/alpha/plugins/test.lua b/lua/plugins/test.lua
index 7fcabc9..7fcabc9 100644
--- a/lua/alpha/plugins/test.lua
+++ b/lua/plugins/test.lua
diff --git a/lua/alpha/plugins/transparent.lua b/lua/plugins/transparent.lua
index fa0b480..fa0b480 100644
--- a/lua/alpha/plugins/transparent.lua
+++ b/lua/plugins/transparent.lua
diff --git a/lua/alpha/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 49a1d16..b41eb3c 100644
--- a/lua/alpha/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -8,7 +8,7 @@ return {
     },
     config = function()
         require "nvim-treesitter.configs".setup {
-            ensure_installed = { "php", "phpdoc", "vim", "go", "gomod", "css", "html", "javascript", "lua", "typescript", "yaml" },
+            ensure_installed = { "php", "phpdoc", "vim", "go", "gomod", "css", "html", "javascript", "lua", "typescript", "yaml", "query" },
             highlight = {
                 enable = true,
                 additional_vim_regex_highlighting = false,
diff --git a/lua/alpha/plugins/trouble.lua b/lua/plugins/trouble.lua
index 2a08443..2a08443 100644
--- a/lua/alpha/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
diff --git a/lua/alpha/plugins/worktree.lua b/lua/plugins/worktree.lua
index bd7c923..bd7c923 100644
--- a/lua/alpha/plugins/worktree.lua
+++ b/lua/plugins/worktree.lua