diff --git a/config_files/wezterm.lua b/config_files/wezterm.lua index 9444520..bb6af55 100644 --- a/config_files/wezterm.lua +++ b/config_files/wezterm.lua @@ -2,15 +2,15 @@ local wezterm = require("wezterm") local config = wezterm.config_builder() -- workspace dir default -config.default_cwd = os.getenv("HOMEPATH") or os.getenv("HOME").. "/workspace" +config.default_cwd = os.getenv("HOMEPATH") or os.getenv("HOME") .. "/workspace" -- default term prog can be changed with cli args if os.getenv("pwsh") then -config.default_prog = { "pwsh" } + config.default_prog = { "pwsh" } end --styles config.harfbuzz_features = { "calt=1", "clig=1", "liga=1" } -config.font = wezterm.font("JetBrainsMono NF", { weight = "Bold" , style = "Italic"}) +config.font = wezterm.font("JetBrainsMono NF", { weight = "Bold", style = "Italic" }) -- config.font_size = 14 config.color_scheme = "Sakura" config.window_padding = { @@ -20,7 +20,7 @@ config.window_padding = { bottom = "0cell", } -- pane -config.colors = { split = '#E858F5' } +config.colors = { split = "#E858F5" } config.inactive_pane_hsb = { saturation = 0.7, brightness = 0.8, diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index cab8cd1..6c8d5a0 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -20,10 +20,10 @@ require("lazy").setup({ { import = "plugins" }, { import = "plugins.langs.python" }, { import = "plugins.langs.go" }, - {import = "plugins.langs.ruby"}, - {import = "plugins.langs.biome"}, + { import = "plugins.langs.ruby" }, + { import = "plugins.langs.biome" }, { import = "plugins.langs.xml" }, - {import ="plugins.langs.lua"}, + { import = "plugins.langs.lua" }, }, defaults = { -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. diff --git a/lua/layouts/modified_presets.lua b/lua/layouts/modified_presets.lua index b7082db..29c8167 100644 --- a/lua/layouts/modified_presets.lua +++ b/lua/layouts/modified_presets.lua @@ -27,8 +27,6 @@ local layouts = { }, }, - - vs_search = { preview = false, layout = { diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 1382152..150f908 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -2,7 +2,7 @@ return { "saghen/blink.cmp", opts = { keymap = { - [""] = { "select_and_accept", 'fallback' }, + [""] = { "select_and_accept", "fallback" }, }, }, } diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 2e1a8ab..186abb3 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -1,22 +1,22 @@ return { - "stevearc/conform.nvim", - opts = { - -- lsp_formatting = false, - -- fallback = false, - formatters_by_ft = { - python = { "black" }, - go = { "goimports", "gofumpt" }, - xml = { "lemminx" }, - ruby = { "standardrb" }, - json = { "biome" , "json-lsp"}, - css = { "biome" }, - javascript = { "biome" }, - sql = { "pg_format" }, - yaml = {"hydra_lsp"}, - lua = {"stylua"} - }, - }, - dependencies = { - "mason.nvim", - }, + "stevearc/conform.nvim", + opts = { + -- lsp_formatting = false, + -- fallback = false, + formatters_by_ft = { + python = { "black" }, + go = { "goimports", "gofumpt" }, + xml = { "lemminx" }, + ruby = { "standardrb" }, + json = { "biome", "json-lsp" }, + css = { "biome" }, + javascript = { "biome" }, + sql = { "pg_format" }, + yaml = { "hydra_lsp" }, + lua = { "stylua" }, + }, + }, + dependencies = { + "mason.nvim", + }, } diff --git a/lua/plugins/langs/biome/nvim-lspconfig.lua b/lua/plugins/langs/biome/nvim-lspconfig.lua index 94035f0..3304913 100644 --- a/lua/plugins/langs/biome/nvim-lspconfig.lua +++ b/lua/plugins/langs/biome/nvim-lspconfig.lua @@ -1,11 +1,11 @@ return { - "neovim/nvim-lspconfig", - opts = { - servers = { - biome = { - cmd = { "biome", "lsp-proxy" }, - filetypes = { "javascript", "css", "json" }, - }, - }, - }, + "neovim/nvim-lspconfig", + opts = { + servers = { + biome = { + cmd = { "biome", "lsp-proxy" }, + filetypes = { "javascript", "css", "json" }, + }, + }, + }, } diff --git a/lua/plugins/langs/go/nvim-lspconfig.lua b/lua/plugins/langs/go/nvim-lspconfig.lua index 447618c..c2cfca8 100644 --- a/lua/plugins/langs/go/nvim-lspconfig.lua +++ b/lua/plugins/langs/go/nvim-lspconfig.lua @@ -44,7 +44,7 @@ return { gopls = function(_, opts) -- workaround for gopls not supporting semanticTokensProvider -- https://github.com/golang/go/issues/54531#issuecomment-1464982242 - Snacks.util.lsp.on({name="gopls"}, function (_, client) + Snacks.util.lsp.on({ name = "gopls" }, function(_, client) if not client.server_capabilities.semanticTokensProvider then local semantic = client.config.capabilities.textDocument.semanticTokens client.server_capabilities.semanticTokensProvider = { diff --git a/lua/plugins/langs/lua/nvim-lspconfig.lua b/lua/plugins/langs/lua/nvim-lspconfig.lua index 33e4470..e19b44f 100644 --- a/lua/plugins/langs/lua/nvim-lspconfig.lua +++ b/lua/plugins/langs/lua/nvim-lspconfig.lua @@ -1,43 +1,43 @@ return { - "neovim/nvim-lspconfig", - opts = { - servers = { - lua_ls = { - settings = { - Lua = { - runtime = { - version = "LuaJIT", - }, - format = { - enable = true, - defaultConfig = { - indent_style = "space", - indent_size = "2", - max_line_length = "88", - }, - }, - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = { - vim.env.VIMRUNTIME, - }, - checkThirdParty = false, - }, - telemetry = { - enable = false, - }, - }, - }, - }, - }, - setup = { - lua_ls = function() - require("snacks").util.lsp.on({ name = "lua_ls" }, function(_, client) - client.server_capabilities.hoverProvider = true - end) - end, - }, - }, + "neovim/nvim-lspconfig", + opts = { + servers = { + lua_ls = { + settings = { + Lua = { + runtime = { + version = "LuaJIT", + }, + format = { + enable = true, + defaultConfig = { + indent_style = "space", + indent_size = "2", + max_line_length = "88", + }, + }, + diagnostics = { + globals = { "vim" }, + }, + workspace = { + library = { + vim.env.VIMRUNTIME, + }, + checkThirdParty = false, + }, + telemetry = { + enable = false, + }, + }, + }, + }, + }, + setup = { + lua_ls = function() + require("snacks").util.lsp.on({ name = "lua_ls" }, function(_, client) + client.server_capabilities.hoverProvider = true + end) + end, + }, + }, } diff --git a/lua/plugins/langs/python/debugger.lua b/lua/plugins/langs/python/debugger.lua index ddbe19a..277d595 100644 --- a/lua/plugins/langs/python/debugger.lua +++ b/lua/plugins/langs/python/debugger.lua @@ -1,66 +1,63 @@ -- lua/plugins/dap-python.lua return { - -- Core DAP plugin - { - "mfussenegger/nvim-dap", - dependencies = { - -- UI for the debugger - { - "rcarriga/nvim-dap-ui", - dependencies = { "nvim-neotest/nvim-nio" }, - opts = {}, - config = function(_, opts) - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - -- icons + -- Core DAP plugin + { + "mfussenegger/nvim-dap", + dependencies = { + -- UI for the debugger + { + "rcarriga/nvim-dap-ui", + dependencies = { "nvim-neotest/nvim-nio" }, + opts = {}, + config = function(_, opts) + local dap = require("dap") + local dapui = require("dapui") + dapui.setup(opts) + -- icons - vim.fn.sign_define( - "DapBreakpoint", - { text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" } - ) + vim.fn.sign_define("DapBreakpoint", { text = "🔴", texthl = "DiagnosticError", linehl = "", numhl = "" }) - -- Auto open/close UI - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() - end - end, - }, + -- Auto open/close UI + dap.listeners.after.event_initialized["dapui_config"] = function() + dapui.open() + end + dap.listeners.before.event_terminated["dapui_config"] = function() + dapui.close() + end + dap.listeners.before.event_exited["dapui_config"] = function() + dapui.close() + end + end, + }, - -- Virtual text showing variable values - { - "theHamsta/nvim-dap-virtual-text", - opts = {}, - }, + -- Virtual text showing variable values + { + "theHamsta/nvim-dap-virtual-text", + opts = {}, + }, - -- Python-specific adapter - { - "mfussenegger/nvim-dap-python", - config = function() - local dap = require("dap") - -- If installed via Mason: - require("dap-python").setup("~/.local/share/nvim/mason/packages/debugpy/venv/bin/python") - -- remote - table.insert(dap.configurations.python, { - type = "python", - request = "attach", - name = "Attach to Process (5678)", - connect = { - host = "localhost", - port = 5678, - }, - }) - end, - }, - }, + -- Python-specific adapter + { + "mfussenegger/nvim-dap-python", + config = function() + local dap = require("dap") + -- If installed via Mason: + require("dap-python").setup("~/.local/share/nvim/mason/packages/debugpy/venv/bin/python") + -- remote + table.insert(dap.configurations.python, { + type = "python", + request = "attach", + name = "Attach to Process (5678)", + connect = { + host = "localhost", + port = 5678, + }, + }) + end, + }, + }, - keys = { + keys = { -- Basic debugging -- stylua: ignore start { "db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" }, @@ -82,23 +79,23 @@ return { -- DAP UI { "du", function() require("dapui").toggle({}) end, desc = "Dap UI" }, { "de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} }, - -- stylua: ignore end - { - "dI", - function() - local lines = { - "import debugpy", - 'debugpy.listen(("localhost", 5678))', - 'print("                              ")', - 'print(" Debugpy listening on port 5678 ", flush=True)', - 'print("                              ")', - "", - } - vim.api.nvim_buf_set_lines(0, 0, 0, false, lines) - end, - desc = "Insert debugpy listener at top", - ft = "python", - }, - }, - }, + -- stylua: ignore end + { + "dI", + function() + local lines = { + "import debugpy", + 'debugpy.listen(("localhost", 5678))', + 'print("                              ")', + 'print(" Debugpy listening on port 5678 ", flush=True)', + 'print("                              ")', + "", + } + vim.api.nvim_buf_set_lines(0, 0, 0, false, lines) + end, + desc = "Insert debugpy listener at top", + ft = "python", + }, + }, + }, } diff --git a/lua/plugins/langs/python/nvim-lspconfig.lua b/lua/plugins/langs/python/nvim-lspconfig.lua index ea14305..e30c088 100644 --- a/lua/plugins/langs/python/nvim-lspconfig.lua +++ b/lua/plugins/langs/python/nvim-lspconfig.lua @@ -20,7 +20,7 @@ return { init_options = { settings = { logLevel = "error", - configuration = config_path, -- Use the dynamically set config_path + configuration = config_path, -- Use the dynamically set config_path configurationPreference = "filesystemFirst", }, }, diff --git a/lua/plugins/langs/ruby/nvim-lspconfig.lua b/lua/plugins/langs/ruby/nvim-lspconfig.lua index 668700b..f53bef1 100644 --- a/lua/plugins/langs/ruby/nvim-lspconfig.lua +++ b/lua/plugins/langs/ruby/nvim-lspconfig.lua @@ -1,13 +1,13 @@ return { - "neovim/nvim-lspconfig", - opts = { - servers = { - ruby_lsp = { - mason = false, - cmd = { os.getenv("HOME") .. "/.rbenv/shims/ruby-lsp" }, - single_file_support = false, - root_partern = { ".git" }, - }, - }, - }, + "neovim/nvim-lspconfig", + opts = { + servers = { + ruby_lsp = { + mason = false, + cmd = { os.getenv("HOME") .. "/.rbenv/shims/ruby-lsp" }, + single_file_support = false, + root_partern = { ".git" }, + }, + }, + }, } diff --git a/lua/plugins/langs/xml/nvim-lspconfig.lua b/lua/plugins/langs/xml/nvim-lspconfig.lua index 4392ba9..e504394 100644 --- a/lua/plugins/langs/xml/nvim-lspconfig.lua +++ b/lua/plugins/langs/xml/nvim-lspconfig.lua @@ -1,22 +1,22 @@ return { - "neovim/nvim-lspconfig", - opts = { - servers = { - lemminx = { - init_options = { - settings = { - xml = { - format = { - enabled = true, - splitAttributes = false, - }, - validation = { - noGrammar = "ignore", - }, - }, - }, - }, - }, - }, - }, + "neovim/nvim-lspconfig", + opts = { + servers = { + lemminx = { + init_options = { + settings = { + xml = { + format = { + enabled = true, + splitAttributes = false, + }, + validation = { + noGrammar = "ignore", + }, + }, + }, + }, + }, + }, + }, } diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 01ad7b9..5dc98ed 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -20,7 +20,7 @@ return { "shfmt", -- go "goimports", - "gofumpt" + "gofumpt", }, }, } diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 39e7dd8..ef2790b 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -57,11 +57,11 @@ return { git_status = { ignored = false }, grep = { ignored = false, hidden = false, exclude = { "*.po", " *.pot" } }, todo_comments = { ignored = false, hidden = false }, - lsp_symbols = {layout = {preset = "lsp_telescope" }}, + lsp_symbols = { layout = { preset = "lsp_telescope" } }, files = { hidden = true, ignored = true, - exclude = { "venvs/*", "*.pyc", "*.po" ,"node_modules/*", "bundle/*"}, + exclude = { "venvs/*", "*.pyc", "*.po", "node_modules/*", "bundle/*" }, layout = { preset = "file_telescope" }, }, }, diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 1e7dc3a..308417d 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -8,7 +8,7 @@ return { win = { no_overlap = false, }, - preset = 'modern' + preset = "modern", }, }, }