Compare commits

..

No commits in common. "main" and "add-metals" have entirely different histories.

20 changed files with 155 additions and 553 deletions

View file

@ -1,7 +1,3 @@
if vim.g.vscode then
-- VSCode Neovim
require("user.vscode_keymaps")
else
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not vim.loop.fs_stat(lazypath) then
vim.fn.system({
@ -21,18 +17,13 @@ else
vim.g.mapleader = " "
vim.g.maplocalleader = " "
require("lazy").setup("plugins", {
lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json", -- in data directory as normal location read only as managed by nix
dev = {
path = "~/Projects/Neovim",
},
})
require("lazy").setup("plugins")
-- [[ Setting options ]]
-- See `:help vim.o`
-- Set highlight on search
vim.o.hlsearch = true
vim.o.hlsearch = false
vim.o.incsearch = true
-- clipboard
@ -47,9 +38,6 @@ else
-- Enable break indent
vim.o.breakindent = true
-- smart indenting
vim.o.smartindent = true
-- Save undo history
vim.o.undofile = true
@ -88,19 +76,6 @@ else
pattern = "*",
})
-- sets the tab size for json files
vim.api.nvim_create_autocmd("FileType", {
pattern = { "json", "lua", "nix" },
callback = function()
vim.bo.tabstop = 2
vim.bo.shiftwidth = 2
vim.bo.expandtab = true
end,
})
-- Terminal Escape Key Mapping
vim.keymap.set("t", "<Esc>", [[<C-\><C-n>]])
-- Diagnostic keymaps
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
@ -109,4 +84,3 @@ else
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et
end

View file

@ -1,23 +0,0 @@
return {
"yetone/avante.nvim",
event = "VeryLazy",
lazy = false,
version = false,
opts = {
provider = "openai",
openai = {
api_key_name = "cmd:cat " .. vim.fn.expand("~/.openai"),
},
},
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
build = "make",
dependencies = {
"HakonHarnes/img-clip.nvim",
"MeanderingProgrammer/render-markdown.nvim",
"MunifTanjim/nui.nvim",
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"nvim-treesitter/nvim-treesitter",
"stevearc/dressing.nvim",
},
}

View file

@ -1,46 +0,0 @@
return {
"stevearc/conform.nvim",
config = function()
require("conform").setup({
formatters_by_ft = {
lua = { "stylua" },
nix = { "nixfmt" },
python = function(bufnr)
if require("conform").get_formatter_info("ruff_format", bufnr).available then
return { "ruff_fix", "ruff_format" }
else
return { "isort", "black", "flake8" }
end
end,
scala = { "scalafmt" },
swift = { "swift_format" },
["*"] = { "trim_whitespace", "trim_newlines" },
},
format_on_save = function(bufnr)
-- Disable with a global or buffer-local variable
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
return
end
return { timeout_ms = 500, lsp_fallback = true }
end,
})
vim.api.nvim_create_user_command("FormatDisable", function(args)
if args.bang then
-- FormatDisable! will disable formatting just for this buffer
vim.b.disable_autoformat = true
else
vim.g.disable_autoformat = true
end
end, {
desc = "Disable autoformat-on-save",
bang = true,
})
vim.api.nvim_create_user_command("FormatEnable", function()
vim.b.disable_autoformat = false
vim.g.disable_autoformat = false
end, {
desc = "Re-enable autoformat-on-save",
})
end,
}

View file

@ -1,14 +0,0 @@
return {
"github/copilot.vim",
lazy = false,
config = function()
vim.api.nvim_set_keymap(
"i",
"<C-J>",
'copilot#Accept("\\<CR>")',
{ silent = true, script = true, expr = true, replace_keycodes = false }
)
vim.g.copilot_no_tab_map = true
vim.g.copilot_assume_mapped = true
end,
}

View file

@ -1,18 +0,0 @@
return {
"HakonHarnes/img-clip.nvim",
event = "BufEnter",
opts = {
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
use_absolute_path = true,
},
},
keys = {
-- suggested keymap
{ "<leader>p", "<cmd>PasteImage<cr>", desc = "Paste clipboard image" },
},
}

View file

@ -27,8 +27,6 @@ return {
{ "folke/which-key.nvim", lazy = false },
{
"j-hui/fidget.nvim",
tag = "legacy",
event = "LspAttach",
config = function()
require("fidget").setup()
end,
@ -46,12 +44,20 @@ return {
"softinio/scaladex.nvim",
{
"lukas-reineke/indent-blankline.nvim",
main = "ibl",
config = function()
require("ibl").setup({
indent = { char = "" },
require("indent_blankline").setup({
char = "",
show_trailing_blankline_indent = false,
})
end,
},
"SidOfc/mkdx",
"tpope/vim-fugitive",
"tpope/vim-rhubarb",
"tpope/vim-sleuth",
{
"numToStr/Comment.nvim",
config = function()
require("Comment").setup()
end,
},
}

View file

@ -1,22 +1,25 @@
return {
"neovim/nvim-lspconfig",
dependencies = {
-- Automatically install LSPs to stdpath for neovim
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
-- Useful status updates for LSP
"j-hui/fidget.nvim",
-- Additional lua configuration, makes nvim stuff amazing
"folke/neodev.nvim",
-- schemas for json and yaml files
"b0o/schemastore.nvim",
},
config = function()
-- LSP settings.
-- Require the lspconfig module
local lspconfig = require("lspconfig")
-- This function gets run when an LSP connects to a particular buffer.
local on_attach = function(_, bufnr)
-- We create a function that lets us more easily define mappings specific
-- 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
-- many times.
--
-- 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 nmap = function(keys, func, desc)
if desc then
@ -54,77 +57,49 @@ return {
end, { desc = "Format current buffer with LSP" })
end
-- 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. They will be passed to
-- the `settings` field of the server config. You must look up that documentation yourself.
local servers = {
basedpyright = {
analysis = {
autoImportCompletions = true,
autoSearchPaths = true,
diagnosticMode = "openFilesOnly",
reportMissingImports = true,
reportMissingParameterType = true,
reportUnnecessaryComparison = true,
reportUnnecessaryContains = true,
reportUnusedClass = true,
reportUnusedFunction = true,
reportUnsedImports = true,
reportUnsusedVariables = true,
typeCheckingMode = "all",
useLibraryCodeForTypes = true,
},
},
bashls = {
bashIde = {
globPattern = "*@(.sh|.inc|.bash|.command)",
},
},
html = {},
jqls = {},
jsonls = {
json = {
format = {
enable = true,
},
schemas = require("schemastore").json.schemas(),
validate = true,
},
},
lua_ls = {
-- clangd = {},
-- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
-- tsserver = {},
sumneko_lua = {
Lua = {
diagnostics = { globals = { "vim" } },
workspace = { checkThirdParty = false },
telemetry = { enable = false },
},
},
marksman = {},
nil_ls = {},
nixd = {},
rust_analyzer = {
diagnostics = {
enable = true,
},
},
sourcekit = {
workspace = {
didChangeConfiguration = {
dynamicRegistration = true,
},
},
},
ts_ls = {},
yamlls = {},
}
--
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
-- Iterate over the servers table and configure each one
for server, config in pairs(servers) do
-- Set up the server using the `config` if provided, otherwise just `on_attach` and `capabilities`
lspconfig[server].setup({
on_attach = on_attach,
capabilities = capabilities,
settings = config, -- Pass the specific server settings here
-- Setup mason so it can manage external tooling
require("mason").setup()
-- Ensure the servers above are installed
local mason_lspconfig = require("mason-lspconfig")
mason_lspconfig.setup({
ensure_installed = vim.tbl_keys(servers),
})
mason_lspconfig.setup_handlers({
function(server_name)
require("lspconfig")[server_name].setup({
capabilities = capabilities,
on_attach = on_attach,
settings = servers[server_name],
})
end,
})
end
end,
}

View file

@ -2,47 +2,13 @@ return {
"nvim-lualine/lualine.nvim",
lazy = false,
config = function()
-- Default from its README then customized
-- Added metals status
require("lualine").setup({
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
disabled_filetypes = {
statusline = {},
winbar = {},
icons_enabled = false,
theme = "tokyonight",
component_separators = "|",
section_separators = "",
},
ignore_focus = {},
always_divide_middle = true,
globalstatus = false,
refresh = {
statusline = 1000,
tabline = 1000,
winbar = 1000,
},
},
sections = {
lualine_a = { "mode" },
lualine_b = { "branch", "diff", "diagnostics" },
lualine_c = { "filename" },
lualine_x = { "g:metals_status", "encoding", "fileformat", "filetype", "overseer" },
lualine_y = { "progress" },
lualine_z = { "location" },
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { "filename" },
lualine_x = { "location" },
lualine_y = {},
lualine_z = {},
},
tabline = {},
winbar = {},
inactive_winbar = {},
extensions = {},
})
end,
}

View file

@ -1,4 +0,0 @@
return {
"euclio/vim-markdown-composer",
build = "cargo build --release",
}

View file

@ -10,17 +10,6 @@ return {
{ "<leader>m", "<cmd>Neotree toggle<cr>", desc = "NeoTree" },
},
config = function()
require("neo-tree").setup({
window = {
position = "right",
},
filesystem = {
filtered_items = {
visible = true,
hide_dotfiles = false,
hide_gitignored = true,
},
},
})
require("neo-tree").setup()
end,
}

View file

@ -1,38 +0,0 @@
return {
"nvim-neotest/neotest",
dependencies = {
"nvim-neotest/nvim-nio",
"nvim-lua/plenary.nvim",
"antoinemadec/FixCursorHold.nvim",
"nvim-treesitter/nvim-treesitter",
"nvim-neotest/neotest-python",
"stevanmilic/neotest-scala",
},
keys = {
{ "<leader>na", "<cmd>lua require('neotest').run.attach()<cr>", desc = "Attach to the nearest test" },
{ "<leader>nl", "<cmd>lua require('neotest').run.run_last()<cr>", desc = "Toggle Test Summary" },
{ "<leader>no", "<cmd>lua require('neotest').output_panel.toggle()<cr>", desc = "Toggle Test Output Panel" },
{ "<leader>np", "<cmd>lua require('neotest').run.stop()<cr>", desc = "Stop the nearest test" },
{ "<leader>ns", "<cmd>lua require('neotest').summary.toggle()<cr>", desc = "Toggle Test Summary" },
{ "<leader>nt", "<cmd>lua require('neotest').run.run()<cr>", desc = "Run the nearest test" },
{
"<leader>nT",
"<cmd>lua require('neotest').run.run(vim.fn.expand('%'))<cr>",
desc = "Run test the current file",
},
},
opts = {
adapters = {
["neotest-python"] = {
runner = "pytest",
args = { "-vvv" },
python = ".venv/bin/python",
},
["neotest-scala"] = {
runner = "sbt",
command = "test",
framework = "munit",
},
},
},
}

View file

@ -1,42 +1,16 @@
return {
"scalameta/nvim-metals",
lazy = false,
keys = {
{ "<leader>ws", "<cmd>lua require'metals'.hover_worksheet()<cr>", desc = "Metals Worksheet" },
{
"<leader>sm",
"<cmd>lua require'telescope'.extensions.metals.commands()<cr>",
desc = "Telescope Metals Commands",
},
},
config = function()
local metals_config = require("metals").bare_config()
metals_config.tvp = {
icons = {
enabled = true,
},
}
metals_config.settings = {
serverVersion = "latest.snapshot",
useGlobalExecutable = true,
showImplicitArguments = true,
showImplicitConversionsAndClasses = true,
showInferredType = true,
bloopSbtAlreadyInstalled = true,
excludedPackages = { "akka.actor.typed.javadsl", "com.github.swagger.akka.javadsl" },
-- fallbackScalaVersion = "2.13.8",
superMethodLensesEnabled = true,
}
metals_config.on_attach = function(client, bufnr)
vim.keymap.set("n", "<leader>tt", require("metals.tvp").toggle_tree_view)
vim.keymap.set("n", "<leader>tr", require("metals.tvp").reveal_in_tree)
vim.cmd([[autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()]])
vim.cmd([[autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()]])
vim.cmd([[autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()]])
end
metals_config.init_options.statusBarProvider = "on"
metals_config.capabilities = require("cmp_nvim_lsp").default_capabilities()

View file

@ -1,25 +0,0 @@
return {
"pwntester/octo.nvim",
cmd = "Octo",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim",
"nvim-tree/nvim-web-devicons",
},
config = function()
require("octo").setup({
enable_builtin = true,
file_panel = { use_icons = true },
mappings = {
review_diff = {
select_next_entry = { lhs = "<Tab>", desc = "move to previous changed file" },
select_prev_entry = { lhs = "<S-Tab>", desc = "move to next changed file" },
},
},
})
vim.treesitter.language.register("markdown", "octo")
end,
keys = {
{ "<leader>o", "<cmd>Octo<cr>", desc = "Octo" },
},
}

View file

@ -1,11 +0,0 @@
return {
"MeanderingProgrammer/render-markdown.nvim",
dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
---@module 'render-markdown'
---@type render.md.UserConfig
opts = {
file_types = { "markdown", "Avante" },
render_modes = true,
},
ft = { "markdown", "Avante" },
}

View file

@ -1,26 +0,0 @@
return {
"mrjones2014/smart-splits.nvim",
lazy = false,
keys = {
-- resizing splits
{ "<A-a>", ":lua require('smart-splits').resize_left()<CR>", desc = "smart split: resize left" },
{ "<A-o>", ":lua require('smart-splits').resize_down()<CR>", desc = "smart split: resize down" },
{ "<A-e>", ":lua require('smart-splits').resize_up()<CR>", desc = "smart split: resize up" },
{ "<A-u>", ":lua require('smart-splits').resize_right()<CR>", desc = "smart split: resize right" },
-- moving between splits
{ "<C-a>", ":lua require('smart-splits').move_cursor_left()<CR>", desc = "smart split: move cursor left" },
{ "<C-o>", ":lua require('smart-splits').move_cursor_down()<CR>", desc = "smart split: move cursor up" },
{ "<C-e>", ":lua require('smart-splits').move_cursor_up()<CR>", desc = "smart split: move cursor up" },
{ "<C-u>", ":lua require('smart-splits').move_cursor_right()<CR>", desc = "smart split: move cursor right" },
{
"<C-\\>",
":lua require('smart-splits').move_cursor_previous()<CR>",
desc = "smart split: move cursor to previous",
},
-- swapping buffers between windows
{ "<leader><leader>a", ":lua require('smart-splits').swap_buf_left()<CR>", desc = "smart split: swap left" },
{ "<leader><leader>o", ":lua require('smart-splits').swap_buf_down()<CR>", desc = "smart split: swap down" },
{ "<leader><leader>e", ":lua require('smart-splits').swap_buf_up()<CR>", desc = "smart split: swap up" },
{ "<leader><leader>u", ":lua require('smart-splits').swap_buf_right()<CR>", desc = "smart split: swap right" },
},
}

View file

@ -4,8 +4,6 @@ return {
dependencies = {
"nvim-lua/plenary.nvim",
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
"debugloop/telescope-undo.nvim",
"nvim-telescope/telescope-ui-select.nvim",
},
config = function()
require("telescope").setup({
@ -22,8 +20,6 @@ return {
-- Enable telescope fzf native, if installed
pcall(require("telescope").load_extension, "fzf")
pcall(require("telescope").load_extension, "scaladex")
pcall(require("telescope").load_extension, "ui-select")
pcall(require("telescope").load_extension, "undo")
-- See `:help telescope.builtin`
vim.keymap.set("n", "<leader>?", require("telescope.builtin").oldfiles, { desc = "[?] Find recently opened files" })
@ -41,6 +37,5 @@ return {
vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string, { desc = "[S]earch current [W]ord" })
vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep, { desc = "[S]earch by [G]rep" })
vim.keymap.set("n", "<leader>sd", require("telescope.builtin").diagnostics, { desc = "[S]earch [D]iagnostics" })
vim.keymap.set("n", "<leader>su", "<cmd>Telescope undo<cr>", { desc = "[S]earch [U]ndo" })
end,
}

View file

@ -8,7 +8,7 @@ return {
vim.g.vimtex_compiler_method = "tectonic"
-- nvim-texlabconfig
local tex_preview_executable = "skim"
local tex_preview_executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"
local tex_preview_args = { "%l", "%p", "%f" }
local texlab_build_executable = "tectonic"
local texlab_build_args = {

View file

@ -1,12 +0,0 @@
return {
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
keys = {
{ "<leader>t", "<cmd>TodoTelescope<cr>", desc = "To Do Comments" },
},
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
},
}

View file

@ -4,28 +4,28 @@ return {
-- build = function()
-- pcall(require("nvim-treesitter.install").update({ with_sync = true }))
-- end,
dependencies = {
"nvim-treesitter/nvim-treesitter-context",
"nvim-treesitter/nvim-treesitter-refactor",
"nvim-treesitter/nvim-treesitter-textobjects",
"nvim-treesitter/playground",
},
dependencies = { "nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/playground" },
config = function()
require("nvim-treesitter.configs").setup({
-- Add languages to be installed here that you want installed for treesitter
ensure_installed = {
"awk",
"bash",
"c",
"cpp",
"css",
"go",
"lua",
"python",
"rust",
"typescript",
"help",
"vim",
"scala",
"bash",
"dockerfile",
"fish",
"git_rebase",
"gitattributes",
"gitcommit",
"gitignore",
"go",
"haskell",
"hocon",
"html",
@ -34,25 +34,12 @@ return {
"javascript",
"json",
"json5",
"jsonc",
"latex",
"lua",
"make",
"markdown",
"markdown_inline",
"nix",
"proto",
"python",
"rust",
"scala",
"scss",
"sql",
"swift",
"terraform",
"toml",
"typescript",
"vim",
"xml",
"yaml",
},
@ -64,13 +51,7 @@ return {
auto_install = true,
highlight = { enable = true },
indent = {
enable = true,
disable = {
"python",
"css",
},
},
indent = { enable = true, disable = { "python" } },
incremental_selection = {
enable = true,
keymaps = {

View file

@ -1,41 +0,0 @@
local keymap = vim.keymap.set
local opts = { noremap = true, silent = true }
-- remap leader key
keymap("n", "<Space>", "", opts)
vim.g.mapleader = " "
vim.g.maplocalleader = " "
-- yank to system clipboard
keymap({ "n", "v" }, "<leader>y", '"+y', opts)
-- paste from system clipboard
keymap({ "n", "v" }, "<leader>p", '"+p', opts)
-- better indent handling
keymap("v", "<", "<gv", opts)
keymap("v", ">", ">gv", opts)
-- move text up and down
keymap("v", "J", ":m .+1<CR>==", opts)
keymap("v", "K", ":m .-2<CR>==", opts)
keymap("x", "J", ":move '>+1<CR>gv-gv", opts)
keymap("x", "K", ":move '<-2<CR>gv-gv", opts)
-- paste preserves primal yanked piece
keymap("v", "p", '"_dP', opts)
-- removes highlighting after escaping vim search
keymap("n", "<Esc>", "<Esc>:noh<CR>", opts)
-- call vscode commands from neovim
keymap({ "n", "v" }, "<leader>t", "<cmd>lua require('vscode').action('workbench.action.terminal.toggleTerminal')<CR>")
keymap({ "n", "v" }, "<leader>b", "<cmd>lua require('vscode').action('editor.debug.action.toggleBreakpoint')<CR>")
keymap({ "n", "v" }, "<leader>d", "<cmd>lua require('vscode').action('editor.action.showHover')<CR>")
keymap({ "n", "v" }, "<leader>a", "<cmd>lua require('vscode').action('editor.action.quickFix')<CR>")
keymap({ "n", "v" }, "<leader>sp", "<cmd>lua require('vscode').action('workbench.actions.view.problems')<CR>")
keymap({ "n", "v" }, "<leader>cn", "<cmd>lua require('vscode').action('notifications.clearAll')<CR>")
keymap({ "n", "v" }, "<leader>ff", "<cmd>lua require('vscode').action('workbench.action.quickOpen')<CR>")
keymap({ "n", "v" }, "<leader>cp", "<cmd>lua require('vscode').action('workbench.action.showCommands')<CR>")
keymap({ "n", "v" }, "<leader>pr", "<cmd>lua require('vscode').action('code-runner.run')<CR>")
keymap({ "n", "v" }, "<leader>fd", "<cmd>lua require('vscode').action('editor.action.formatDocument')<CR>")