diff --git a/nvim/init.lua b/nvim/init.lua index 196174f..1b79ed2 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -7,9 +7,8 @@ require("plugins") -- Config for Nord, which I usually use -- vim.g.nord_italic = false -- vim.g.nord_bold = false --- vim.opt.background = "light" -vim.opt.background = "dark" -vim.cmd [[ colorscheme warlock ]] +vim.opt.background = "light" +--vim.opt.background = "dark" -- Formatting and vim config vim.opt.expandtab = true @@ -29,7 +28,7 @@ vim.opt.wrap = false vim.opt.lcs = vim.opt.lcs + "space:ยท" vim.opt.list = true vim.opt.textwidth = 88 ---vim.cmd [[ colorscheme catppuccin-latte ]] +vim.cmd [[ colorscheme alabaster ]] -- Force OSC-52 vim.g.clipboard = { @@ -78,6 +77,8 @@ vim.api.nvim_create_user_command("ConjureChicken", set_chicken, {}) local keymap = vim.keymap.set local noremap = { noremap = true } local silentnoremap = { noremap = true, silent = true } +--Toggle background +keymap("n", "bg", function() if vim.o.background == "light" then vim.o.background = "dark" else vim.o.background = "light" end end, noremap) -- Easier breaking from edit modes keymap("n", ";;", "", noremap) keymap("v", ";;", "", noremap) diff --git a/nvim/lua/ambient.lua b/nvim/lua/ambient.lua new file mode 100644 index 0000000..2ae7a26 --- /dev/null +++ b/nvim/lua/ambient.lua @@ -0,0 +1,8 @@ +function setup() + return require("codecompanion.adapters").extend("openai_compatible", { + env = { + url = "http://34.46.152.76", + chat_url = "/run-auction" + } + }) +end diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua index 4b6e7fa..a838199 100644 --- a/nvim/lua/lsp.lua +++ b/nvim/lua/lsp.lua @@ -2,7 +2,6 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities() -- ######################## -- #### Set up LSPs #### -- ######################## -require('lspconfig') vim.lsp.config("*", { capabilities = capabilities diff --git a/nvim/lua/lsp/pylsp.lua b/nvim/lua/lsp/pylsp.lua index 92ca1f1..c69f32e 100644 --- a/nvim/lua/lsp/pylsp.lua +++ b/nvim/lua/lsp/pylsp.lua @@ -1,4 +1,5 @@ return { -- cmd = {"/home/noah/.envs/nvim/bin/pylsp"}, + cmd = "basedpyright", root_markers = { "pants.toml", "pyproject.toml", "setup.py", "setup.cfg", "Pipfile" }, } diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 88b6e1c..136cffb 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -15,7 +15,7 @@ local lazy_bootstrap = ensure_lazy() if lazy_bootstrap then print("Bootstrapped lazy.nvim") end require("lazy").setup({ - install = { colorscheme = { "warlock" } }, + install = { colorscheme = { "alabaster" } }, checker = { enabled = false }, spec = { -- Color themes @@ -27,6 +27,7 @@ require("lazy").setup({ { "sontungexpt/witch", priority = 1000, lazy = true, config = true }, { "rose-pine/neovim", priority = 1000, lazy = true }, { "catppuccin/nvim", name = "catppuccin", priority = 1000, lazy = true }, + { "p00f/alabaster.nvim", priority = 1000, lazy = true }, { "neanias/everforest-nvim", version = false, @@ -85,6 +86,7 @@ require("lazy").setup({ }, -- nvim lsp plugins { "neovim/nvim-lspconfig", + config = false }, -- LSP Goodness { @@ -327,6 +329,30 @@ require("lazy").setup({ }, { "imsnif/kdl.vim", lazy = true, ft = "kdl" }, { "catgoose/nvim-colorizer.lua", lazy = true, ft = { "css", "html", "toml", "conf" } }, - { "github/copilot.vim", lazy = true, cmd = { "Copilot" } } + { "github/copilot.vim", lazy = true, cmd = { "Copilot" } }, + { + "cshuaimin/ssr.nvim", + config = function() + local ssr = require("ssr") + ssr.setup { + border = "rounded", + min_width = 50, + min_height = 5, + max_width = 120, + max_height = 25, + adjust_window = true, + keymaps = { + close = "q", + next_match = "n", + prev_match = "N", + replace_confirm = "", + replace_all = "", + }, + } + vim.keymap.set({ "n", "x" }, "sr", function() ssr.open() end) + end + }, + { "lewis6991/gitsigns.nvim", config = true }, + } })