refactor: remove go.nvim

This commit is contained in:
isabel 2025-02-25 19:01:31 +00:00
parent 140fd66b66
commit 875ba4f1d2
No known key found for this signature in database
GPG key ID: 3E7C7A1B5DEDBB03
6 changed files with 38 additions and 75 deletions

View file

@ -574,7 +574,7 @@
},
"nvim-lspconfig": {
"cargoLocks": null,
"date": "2025-02-18",
"date": "2025-02-23",
"extract": null,
"name": "nvim-lspconfig",
"passthru": null,
@ -586,12 +586,12 @@
"name": null,
"owner": "neovim",
"repo": "nvim-lspconfig",
"rev": "1110787f1b464888c59a044c48c5119d14078044",
"sha256": "sha256-p8vw+tp7phTFJL9uRyzMw9sZbANVYNswk9frigZQyaY=",
"rev": "9e932edb0af4e20880685ddb96a231669fbe8091",
"sha256": "sha256-meyURDGVk4/QnVihqRDpC6cX1WUtClgJR0f6pMR4HCI=",
"sparseCheckout": [],
"type": "github"
},
"version": "1110787f1b464888c59a044c48c5119d14078044"
"version": "9e932edb0af4e20880685ddb96a231669fbe8091"
},
"nvim-navic": {
"cargoLocks": null,

View file

@ -330,15 +330,15 @@
};
nvim-lspconfig = {
pname = "nvim-lspconfig";
version = "1110787f1b464888c59a044c48c5119d14078044";
version = "9e932edb0af4e20880685ddb96a231669fbe8091";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "1110787f1b464888c59a044c48c5119d14078044";
rev = "9e932edb0af4e20880685ddb96a231669fbe8091";
fetchSubmodules = false;
sha256 = "sha256-p8vw+tp7phTFJL9uRyzMw9sZbANVYNswk9frigZQyaY=";
sha256 = "sha256-meyURDGVk4/QnVihqRDpC6cX1WUtClgJR0f6pMR4HCI=";
};
date = "2025-02-18";
date = "2025-02-23";
};
nvim-navic = {
pname = "nvim-navic";

View file

@ -347,6 +347,35 @@ return {
"typescript",
},
},
gopls = {
single_file_support = true,
filetypes = { 'go', 'gomod', 'gosum', 'gotmpl', 'gohtmltmpl', 'gotexttmpl' },
cmd = {
'gopls', -- share the gopls instance if there is one already
'-remote.debug=:0',
},
settings = {
gopls = {
hints = {
assignVariableTypes = true,
compositeLiteralFields = true,
compositeLiteralTypes = true,
constantValues = true,
functionTypeParameters = true,
parameterNames = true,
rangeVariableTypes = true,
},
usePlaceholders = true,
completeUnimported = true,
staticcheck = true,
matcher = 'Fuzzy',
diagnosticsDelay = '500ms',
symbolMatcher = 'fuzzy',
semanticTokens = true,
gofumpt = true,
},
},
},
helm_ls = {},
hls = {},
html = {},
@ -468,40 +497,6 @@ return {
event = "BufRead Cargo.toml",
},
{
"go.nvim",
ft = {
"go",
"gomod",
"gosum",
"gotmpl",
"gohtmltmpl",
"gotexttmpl",
},
after = function()
-- setup go stuff
require("go").setup({
disable_defaults = false,
icons = {
breakpoint = "",
currentpos = "",
},
trouble = true,
luasnip = true,
dap_debug_keymap = false,
lsp_cfg = false,
lsp_keymaps = false,
lsp_inlay_hints = {
enable = true,
style = "inlay",
},
})
require("lspconfig").gopls.setup(require("go.lsp").config())
end,
},
{ "guihua.lua" },
{
"quill.nvim",
after = function()

21
flake.lock generated
View file

@ -1,25 +1,5 @@
{
"nodes": {
"beapkgs": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1739839189,
"narHash": "sha256-WukKdzm/wNAgWKAew8Bip0j40TCOdyJqUAzmJXyD3uU=",
"owner": "isabelroses",
"repo": "beapkgs",
"rev": "a52e9ab94e8dc918a6b30432ddc8da669456b980",
"type": "github"
},
"original": {
"owner": "isabelroses",
"repo": "beapkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1739736696,
@ -38,7 +18,6 @@
},
"root": {
"inputs": {
"beapkgs": "beapkgs",
"nixpkgs": "nixpkgs",
"systems": "systems"
}

View file

@ -3,12 +3,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
beapkgs = {
url = "github:isabelroses/beapkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
systems.url = "github:nix-systems/default";
};
@ -17,7 +11,6 @@
self,
nixpkgs,
systems,
beapkgs,
...
}:
let
@ -31,7 +24,7 @@
import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [ beapkgs.overlays.default ];
overlays = [ ];
}
)
);

View file

@ -28,7 +28,6 @@
vscode-langservers-extracted,
ltex-ls,
marksman,
gonvim-tools,
# nil,
statix,
deadnix,
@ -135,9 +134,6 @@ let
ltex-ls
marksman
# go
gonvim-tools
# nix
(callPackage ./nil.nix { })
statix