@@ -51,6 +51,11 @@ require("lazy").setup({
5151 priority = 1000,
5252 opts = {},
5353 },
54+ {
55+ "nyoom-engineering/oxocarbon.nvim",
56+ lazy = false,
57+ priority = 1000,
58+ },
5459
5560 -- Statusline
5661 {
@@ -131,98 +136,99 @@ require("lazy").setup({
131136 end,
132137 },
133138
134- -- LSP/etc with Mason
135- {
136- "neovim/nvim-lspconfig",
137- config = function()
138- local function executable(path)
139- return path and vim.fn.executable(path) == 1
140- end
141-
142- local function join(...)
143- return table.concat({ ... }, "/")
144- end
145-
146- local function project_python(root_dir)
147- if root_dir then
148- for _, venv_name in ipairs({ ".venv", "venv" }) do
149- local python = join(root_dir, venv_name, "bin", "python")
150- if executable(python) then
151- return python
152- end
153- end
154- end
155-
156- if vim.env.VIRTUAL_ENV then
157- local python = join(vim.env.VIRTUAL_ENV, "bin", "python")
158- if executable(python) then
159- return python
160- end
161- end
162-
163- local python3 = vim.fn.exepath("python3")
164- if python3 ~= "" then
165- return python3
166- end
167-
168- local python = vim.fn.exepath("python")
169- if python ~= "" then
170- return python
171- end
172- end
173-
174- vim.lsp.config("pyright", {
175- before_init = function(_, config)
176- local python = project_python(config.root_dir)
177- if not python then
178- return
179- end
180-
181- config.settings = config.settings or {}
182- config.settings.python = config.settings.python or {}
183- config.settings.python.pythonPath = python
184-
185- config.settings.python.analysis = config.settings.python.analysis or {}
186- config.settings.python.analysis.autoSearchPaths = true
187- config.settings.python.analysis.useLibraryCodeForTypes = true
188-
189- local src_path = config.root_dir and join(config.root_dir, "src") or nil
190- if src_path and vim.fn.isdirectory(src_path) == 1 then
191- config.settings.python.analysis.extraPaths = { src_path }
192- end
193- end,
194- })
195- end,
196- },
197- {
198- "mason-org/mason.nvim",
199- config = function()
200- require("mason").setup()
201- end,
202- },
203- {
204- "mason-org/mason-lspconfig.nvim",
205- config = function()
206- require("mason-lspconfig").setup({
207- ensure_installed = {
208- "biome",
209- "emmylua_ls",
210- "gopls",
211- "pyright",
212- "ruff",
213- "ts_ls",
214- "zls",
215- },
216- automatic_enable = true,
217- })
218- end,
219- },
220-
221139 -- Use vim-ai-complete for autocomplete
222140 {
223141 "sacenox/vim-ai-complete",
224142 name = "vim-ai-complete",
225143 },
144+
145+ -- NO LSPs RIGHT NOW --
146+ -- LSP/etc with Mason
147+ -- {
148+ -- "neovim/nvim-lspconfig",
149+ -- config = function()
150+ -- local function executable(path)
151+ -- return path and vim.fn.executable(path) == 1
152+ -- end
153+ --
154+ -- local function join(...)
155+ -- return table.concat({ ... }, "/")
156+ -- end
157+ --
158+ -- local function project_python(root_dir)
159+ -- if root_dir then
160+ -- for _, venv_name in ipairs({ ".venv", "venv" }) do
161+ -- local python = join(root_dir, venv_name, "bin", "python")
162+ -- if executable(python) then
163+ -- return python
164+ -- end
165+ -- end
166+ -- end
167+ --
168+ -- if vim.env.VIRTUAL_ENV then
169+ -- local python = join(vim.env.VIRTUAL_ENV, "bin", "python")
170+ -- if executable(python) then
171+ -- return python
172+ -- end
173+ -- end
174+ --
175+ -- local python3 = vim.fn.exepath("python3")
176+ -- if python3 ~= "" then
177+ -- return python3
178+ -- end
179+ --
180+ -- local python = vim.fn.exepath("python")
181+ -- if python ~= "" then
182+ -- return python
183+ -- end
184+ -- end
185+ --
186+ -- vim.lsp.config("pyright", {
187+ -- before_init = function(_, config)
188+ -- local python = project_python(config.root_dir)
189+ -- if not python then
190+ -- return
191+ -- end
192+ --
193+ -- config.settings = config.settings or {}
194+ -- config.settings.python = config.settings.python or {}
195+ -- config.settings.python.pythonPath = python
196+ --
197+ -- config.settings.python.analysis = config.settings.python.analysis or {}
198+ -- config.settings.python.analysis.autoSearchPaths = true
199+ -- config.settings.python.analysis.useLibraryCodeForTypes = true
200+ --
201+ -- local src_path = config.root_dir and join(config.root_dir, "src") or nil
202+ -- if src_path and vim.fn.isdirectory(src_path) == 1 then
203+ -- config.settings.python.analysis.extraPaths = { src_path }
204+ -- end
205+ -- end,
206+ -- })
207+ -- end,
208+ -- },
209+ -- {
210+ -- "mason-org/mason.nvim",
211+ -- config = function()
212+ -- require("mason").setup()
213+ -- end,
214+ -- },
215+ -- {
216+ -- "mason-org/mason-lspconfig.nvim",
217+ -- config = function()
218+ -- require("mason-lspconfig").setup({
219+ -- ensure_installed = {
220+ -- "biome",
221+ -- "emmylua_ls",
222+ -- "gopls",
223+ -- "pyright",
224+ -- "ruff",
225+ -- "ts_ls",
226+ -- "zls",
227+ -- },
228+ -- automatic_enable = true,
229+ -- })
230+ -- end,
231+ -- },
226232 },
227233
228234 -- Configure any other settings here. See the documentation for more details.
@@ -265,4 +271,4 @@ vim.api.nvim_create_user_command('Q', 'q', {})
265271 vim.api.nvim_create_user_command('W', 'w', {})
266272
267273 -- Set a nice theme?
268-vim.cmd.colorscheme('tokyonight-night')
274+vim.cmd.colorscheme('oxocarbon')