Compare commits
5 Commits
fee274f0ba
...
bad316d19e
Author | SHA1 | Date | |
---|---|---|---|
bad316d19e | |||
d7ce54ca41 | |||
bcdd2f6c4b | |||
7f9f289b9a | |||
ff1652c1e3 |
@ -338,6 +338,7 @@ in
|
||||
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
|
||||
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
|
||||
environment.systemPackages = [
|
||||
# Required on darwin for podman machine to work.
|
||||
vfkit
|
||||
];
|
||||
|
||||
|
@ -194,6 +194,7 @@ EOF";
|
||||
nvim-treesitter-parsers.promql
|
||||
nvim-treesitter-parsers.nix
|
||||
nvim-treesitter-parsers.hoon
|
||||
nvim-treesitter-parsers.c_sharp
|
||||
omnisharp-extended-lsp-nvim
|
||||
#neotest-dotnet
|
||||
nix-develop-nvim
|
||||
@ -309,7 +310,6 @@ EOF";
|
||||
htop
|
||||
colima
|
||||
ghidra
|
||||
#podman-desktop # Broken on darwin right now with electron build issues.
|
||||
podman
|
||||
podman-compose
|
||||
qemu
|
||||
@ -335,6 +335,7 @@ EOF";
|
||||
sc-im
|
||||
gnumeric
|
||||
wezterm
|
||||
wezterm.terminfo
|
||||
#ocaml
|
||||
#opam
|
||||
unstablePkgs.vector
|
||||
|
@ -232,16 +232,18 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
||||
vim.keymap.set({ "n", "v" }, "<Leader>a", vim.lsp.buf.code_action, opts)
|
||||
vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, opts)
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if client.server_capabilities.codelens then
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
if client and client.server_capabilities.codelens then
|
||||
vim.lsp.codelens.refresh()
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd({ 'BufEnter', 'InsertLeave', 'CursorHold' }, {
|
||||
callback = function(_)
|
||||
local clients = vim.lsp.get_active_clients()
|
||||
callback = function(args)
|
||||
local clients = vim.lsp.get_clients({bufnr=args.buf})
|
||||
for cid = 1, #clients do
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
if clients[cid].server_capabilities.codelens then
|
||||
vim.lsp.codelens.refresh()
|
||||
break
|
||||
@ -272,7 +274,7 @@ vim.diagnostic.config({
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = 'rounded',
|
||||
source = 'always',
|
||||
source = true,
|
||||
header = '',
|
||||
prefix = '',
|
||||
},
|
||||
@ -292,7 +294,7 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
-- updatetime: set updatetime for CursorHold
|
||||
vim.opt.completeopt = { 'menuone', 'noselect', 'noinsert' }
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true }
|
||||
vim.api.nvim_set_option('updatetime', 300)
|
||||
vim.api.nvim_set_option_value('updatetime', 300, { scope = "global" })
|
||||
vim.opt.sessionoptions = { 'buffers', 'curdir', 'skiprtp', 'localoptions', 'terminal', 'tabpages' }
|
||||
-- Fixed column for diagnostics to appear
|
||||
-- Show autodiagnostic popup on cursor hover_range
|
||||
@ -452,7 +454,7 @@ end)
|
||||
-- Neogit integration
|
||||
-- See https://github.com/NeogitOrg/neogit for configuration information.
|
||||
local neogit = require('neogit')
|
||||
neogit.setup()
|
||||
neogit.setup {}
|
||||
|
||||
vim.keymap.set("n", "<Leader>mg", function()
|
||||
neogit.open()
|
||||
@ -529,7 +531,7 @@ lean.setup {
|
||||
vim.keymap.set({ "n", "v" }, "<Leader>ti", function() vim.cmd("LeanInfoviewToggle") end, opts)
|
||||
vim.keymap.set({ "n", "v" }, "<Leader>sg", function() vim.cmd("LeanGoal") end, opts)
|
||||
vim.keymap.set({ "n", "v" }, "<Leader>stg", function() vim.cmd("LeanTermGoal") end, opts)
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
vim.api.nvim_set_option_value('omnifunc', 'v:lua.vim.lsp.omnifunc', {scope = "local", buf=bufnr})
|
||||
end
|
||||
},
|
||||
mappings = true,
|
||||
@ -546,7 +548,6 @@ vim.keymap.set("n", "<Leader>sl", telescope_builtins.lsp_workspace_symbols)
|
||||
vim.keymap.set("n", "<Leader>dl", telescope_builtins.diagnostics)
|
||||
vim.keymap.set("n", "<Leader>rg", telescope_builtins.live_grep)
|
||||
vim.keymap.set("n", "<Leader>bl", function() telescope_builtins.buffers({
|
||||
|
||||
}) end)
|
||||
|
||||
-- harpoon keymaps
|
||||
|
Loading…
x
Reference in New Issue
Block a user