chore: minimise profile

This commit is contained in:
isabel 2024-07-19 14:14:23 +01:00
parent 93c878439f
commit 2f0e3bef64
No known key found for this signature in database
GPG key ID: 7F2F6BD6997FCDF7
14 changed files with 677 additions and 352 deletions

4
.envrc
View file

@ -1 +1,3 @@
use flake . --accept-flake-config
if has nix_direnv_version; then
use flake
fi

View file

@ -21,7 +21,7 @@
},
"catppuccin": {
"cargoLocks": null,
"date": "2024-07-11",
"date": "2024-07-18",
"extract": null,
"name": "catppuccin",
"passthru": null,
@ -33,11 +33,11 @@
"name": null,
"owner": "catppuccin",
"repo": "nvim",
"rev": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700",
"sha256": "sha256-R4NDbp+xBPZ8GSwK4lOndyehuJnrejFwu5Oe5OX4l5U=",
"rev": "0b5df9c9e641b1212b21a0762ccad4434fd41322",
"sha256": "sha256-JhKJQDdHiiDcCtbc8xvdLa6W5oRBDcftM+G5aVEMi6Q=",
"type": "github"
},
"version": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700"
"version": "0b5df9c9e641b1212b21a0762ccad4434fd41322"
},
"cloak": {
"cargoLocks": null,
@ -381,7 +381,7 @@
},
"lazy": {
"cargoLocks": null,
"date": "2024-07-16",
"date": "2024-07-19",
"extract": null,
"name": "lazy",
"passthru": null,
@ -393,11 +393,11 @@
"name": null,
"owner": "folke",
"repo": "lazy.nvim",
"rev": "d731a6b005fd239e85e555bd57362382f6c1e461",
"sha256": "sha256-delPoMoxIe/g7Aidj9JWnDYwOy5MFcG/sRgZjryxWmw=",
"rev": "9a374a0fb4d3ac42dac4a129d4bead7252473c77",
"sha256": "sha256-fRhvF/tnvZSvE2/OeLButsRAeVPBxb6wY6QRY3Zrgrc=",
"type": "github"
},
"version": "d731a6b005fd239e85e555bd57362382f6c1e461"
"version": "9a374a0fb4d3ac42dac4a129d4bead7252473c77"
},
"lazygit": {
"cargoLocks": null,
@ -561,7 +561,7 @@
},
"null-ls": {
"cargoLocks": null,
"date": "2024-07-15",
"date": "2024-07-19",
"extract": null,
"name": "null-ls",
"passthru": null,
@ -573,11 +573,11 @@
"name": null,
"owner": "nvimtools",
"repo": "none-ls.nvim",
"rev": "2870f66b1cb263f6e0bfffdb089739b874343a3a",
"sha256": "sha256-xYGLTQuU+e+EtMY3hRfCHgqt8pjoLTef2WBEsx8Zav4=",
"rev": "4c6605b2ec5dfe4c9694ade0c730c234d1039019",
"sha256": "sha256-Y0YxPuYWPqzP4PIoVwReh7+RGIDWgkf8WdeG7qpPgWI=",
"type": "github"
},
"version": "2870f66b1cb263f6e0bfffdb089739b874343a3a"
"version": "4c6605b2ec5dfe4c9694ade0c730c234d1039019"
},
"nvim-cmp": {
"cargoLocks": null,
@ -621,7 +621,7 @@
},
"nvim-lspconfig": {
"cargoLocks": null,
"date": "2024-07-16",
"date": "2024-07-19",
"extract": null,
"name": "nvim-lspconfig",
"passthru": null,
@ -633,11 +633,11 @@
"name": null,
"owner": "neovim",
"repo": "nvim-lspconfig",
"rev": "01e08d4bf1c35e5126b2ad5209725e4c552289ab",
"sha256": "sha256-lue8eBy4iXLsc5wYB+X/AkjpcSY005Ih8mjlK0XM7MA=",
"rev": "e26da408cf955afa8e9ddbadd510e84ea8976cd7",
"sha256": "sha256-GscyvR1SYGUig7GGLDS5xS5weVi32WJuFOypVaZc044=",
"type": "github"
},
"version": "01e08d4bf1c35e5126b2ad5209725e4c552289ab"
"version": "e26da408cf955afa8e9ddbadd510e84ea8976cd7"
},
"nvim-navic": {
"cargoLocks": null,
@ -701,7 +701,7 @@
},
"nvim-treesitter": {
"cargoLocks": null,
"date": "2024-07-17",
"date": "2024-07-19",
"extract": null,
"name": "nvim-treesitter",
"passthru": null,
@ -713,11 +713,11 @@
"name": null,
"owner": "nvim-treesitter",
"repo": "nvim-treesitter",
"rev": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2",
"sha256": "sha256-Q+1TWNkBTpx6KmtyNwzYDhHFEEctJRrGPX60Ah9ebKE=",
"rev": "0ffe62722307f6755d2c7049837cb2cd6d7d275a",
"sha256": "sha256-BXZLzV/NZYh3O+svLpXzaueqpKv35pa2wdcZa1qT6h8=",
"type": "github"
},
"version": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2"
"version": "0ffe62722307f6755d2c7049837cb2cd6d7d275a"
},
"nvim-web-devicons": {
"cargoLocks": null,
@ -741,7 +741,7 @@
},
"obsidian-nvim": {
"cargoLocks": null,
"date": "2024-07-11",
"date": "2024-07-17",
"extract": null,
"name": "obsidian-nvim",
"passthru": null,
@ -753,11 +753,11 @@
"name": null,
"owner": "epwalsh",
"repo": "obsidian.nvim",
"rev": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b",
"sha256": "sha256-WJ/EKU3QI96jqoNBWCScEDFgxj9djr+2DQm/jluhwSk=",
"rev": "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0",
"sha256": "sha256-7xAJV81UqF8KCXwZcg5bncIYzFJ8Hsu5HY5RajoyIIs=",
"type": "github"
},
"version": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b"
"version": "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0"
},
"plenary": {
"cargoLocks": null,
@ -881,7 +881,7 @@
},
"schemastore": {
"cargoLocks": null,
"date": "2024-07-15",
"date": "2024-07-18",
"extract": null,
"name": "schemastore",
"passthru": null,
@ -893,11 +893,11 @@
"name": null,
"owner": "b0o",
"repo": "schemastore.nvim",
"rev": "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15",
"sha256": "sha256-Z7rRrsEaPwnnwJpZwYYyWRk7dTNVKORfRSJChp3RKQ4=",
"rev": "58a965eedbfe7c358938b0e535ed2d98a4520987",
"sha256": "sha256-jS13dXMliCjYNgMVxOJc9Z2bItG6GyzECTYjk63+j7U=",
"type": "github"
},
"version": "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15"
"version": "58a965eedbfe7c358938b0e535ed2d98a4520987"
},
"telescope": {
"cargoLocks": null,
@ -1040,7 +1040,7 @@
},
"trouble": {
"cargoLocks": null,
"date": "2024-07-15",
"date": "2024-07-19",
"extract": null,
"name": "trouble",
"passthru": null,
@ -1052,15 +1052,15 @@
"name": null,
"owner": "folke",
"repo": "trouble.nvim",
"rev": "bf99ea71a39e322336b7f8be965f86dbf5c65540",
"sha256": "sha256-RvjgVagdt19tSz7HDwAxLAZojjgsp6z2/GYGty9Ifmg=",
"rev": "ad8ef38666834e9e438f84bd446657445bc2a71e",
"sha256": "sha256-9bwmXM0xW4IspLym7Er/snOztTvf+Wa3iTCFo5qBt80=",
"type": "github"
},
"version": "bf99ea71a39e322336b7f8be965f86dbf5c65540"
"version": "ad8ef38666834e9e438f84bd446657445bc2a71e"
},
"typescript-tools": {
"cargoLocks": null,
"date": "2024-07-15",
"date": "2024-07-18",
"extract": null,
"name": "typescript-tools",
"passthru": null,
@ -1072,11 +1072,11 @@
"name": null,
"owner": "pmizio",
"repo": "typescript-tools.nvim",
"rev": "3ecf6b29435dc7979eb5cdf1a9ff11bd65f5ea90",
"sha256": "sha256-I6nglwLJB6U4CEL+SXV9RvFowZe7FeK9DN4AVT/qQ7o=",
"rev": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7",
"sha256": "sha256-8WH/eCff1liDVaezZFvu6RqCtXU4Uwq80BlWiH+tQME=",
"type": "github"
},
"version": "3ecf6b29435dc7979eb5cdf1a9ff11bd65f5ea90"
"version": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7"
},
"undotree": {
"cargoLocks": null,
@ -1100,7 +1100,7 @@
},
"vim-fugitive": {
"cargoLocks": null,
"date": "2024-07-05",
"date": "2024-07-18",
"extract": null,
"name": "vim-fugitive",
"passthru": null,
@ -1112,10 +1112,10 @@
"name": null,
"owner": "tpope",
"repo": "vim-fugitive",
"rev": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc",
"sha256": "sha256-CfwcR1xFUJH3dBfpkyX/sncLopaUPUFPZDfe3aohTNo=",
"rev": "0444df68cd1cdabc7453d6bd84099458327e5513",
"sha256": "sha256-NLHaXpPrb4/QuVuTjl6YUUKA3/1r4VCOaNO48Dk9pms=",
"type": "github"
},
"version": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc"
"version": "0444df68cd1cdabc7453d6bd84099458327e5513"
}
}

80
_sources/generated.nix generated
View file

@ -15,15 +15,15 @@
};
catppuccin = {
pname = "catppuccin";
version = "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700";
version = "0b5df9c9e641b1212b21a0762ccad4434fd41322";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700";
rev = "0b5df9c9e641b1212b21a0762ccad4434fd41322";
fetchSubmodules = false;
sha256 = "sha256-R4NDbp+xBPZ8GSwK4lOndyehuJnrejFwu5Oe5OX4l5U=";
sha256 = "sha256-JhKJQDdHiiDcCtbc8xvdLa6W5oRBDcftM+G5aVEMi6Q=";
};
date = "2024-07-11";
date = "2024-07-18";
};
cloak = {
pname = "cloak";
@ -231,15 +231,15 @@
};
lazy = {
pname = "lazy";
version = "d731a6b005fd239e85e555bd57362382f6c1e461";
version = "9a374a0fb4d3ac42dac4a129d4bead7252473c77";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
rev = "d731a6b005fd239e85e555bd57362382f6c1e461";
rev = "9a374a0fb4d3ac42dac4a129d4bead7252473c77";
fetchSubmodules = false;
sha256 = "sha256-delPoMoxIe/g7Aidj9JWnDYwOy5MFcG/sRgZjryxWmw=";
sha256 = "sha256-fRhvF/tnvZSvE2/OeLButsRAeVPBxb6wY6QRY3Zrgrc=";
};
date = "2024-07-16";
date = "2024-07-19";
};
lazygit = {
pname = "lazygit";
@ -339,15 +339,15 @@
};
null-ls = {
pname = "null-ls";
version = "2870f66b1cb263f6e0bfffdb089739b874343a3a";
version = "4c6605b2ec5dfe4c9694ade0c730c234d1039019";
src = fetchFromGitHub {
owner = "nvimtools";
repo = "none-ls.nvim";
rev = "2870f66b1cb263f6e0bfffdb089739b874343a3a";
rev = "4c6605b2ec5dfe4c9694ade0c730c234d1039019";
fetchSubmodules = false;
sha256 = "sha256-xYGLTQuU+e+EtMY3hRfCHgqt8pjoLTef2WBEsx8Zav4=";
sha256 = "sha256-Y0YxPuYWPqzP4PIoVwReh7+RGIDWgkf8WdeG7qpPgWI=";
};
date = "2024-07-15";
date = "2024-07-19";
};
nvim-cmp = {
pname = "nvim-cmp";
@ -375,15 +375,15 @@
};
nvim-lspconfig = {
pname = "nvim-lspconfig";
version = "01e08d4bf1c35e5126b2ad5209725e4c552289ab";
version = "e26da408cf955afa8e9ddbadd510e84ea8976cd7";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "01e08d4bf1c35e5126b2ad5209725e4c552289ab";
rev = "e26da408cf955afa8e9ddbadd510e84ea8976cd7";
fetchSubmodules = false;
sha256 = "sha256-lue8eBy4iXLsc5wYB+X/AkjpcSY005Ih8mjlK0XM7MA=";
sha256 = "sha256-GscyvR1SYGUig7GGLDS5xS5weVi32WJuFOypVaZc044=";
};
date = "2024-07-16";
date = "2024-07-19";
};
nvim-navic = {
pname = "nvim-navic";
@ -423,15 +423,15 @@
};
nvim-treesitter = {
pname = "nvim-treesitter";
version = "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2";
version = "0ffe62722307f6755d2c7049837cb2cd6d7d275a";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2";
rev = "0ffe62722307f6755d2c7049837cb2cd6d7d275a";
fetchSubmodules = false;
sha256 = "sha256-Q+1TWNkBTpx6KmtyNwzYDhHFEEctJRrGPX60Ah9ebKE=";
sha256 = "sha256-BXZLzV/NZYh3O+svLpXzaueqpKv35pa2wdcZa1qT6h8=";
};
date = "2024-07-17";
date = "2024-07-19";
};
nvim-web-devicons = {
pname = "nvim-web-devicons";
@ -447,15 +447,15 @@
};
obsidian-nvim = {
pname = "obsidian-nvim";
version = "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b";
version = "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0";
src = fetchFromGitHub {
owner = "epwalsh";
repo = "obsidian.nvim";
rev = "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b";
rev = "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0";
fetchSubmodules = false;
sha256 = "sha256-WJ/EKU3QI96jqoNBWCScEDFgxj9djr+2DQm/jluhwSk=";
sha256 = "sha256-7xAJV81UqF8KCXwZcg5bncIYzFJ8Hsu5HY5RajoyIIs=";
};
date = "2024-07-11";
date = "2024-07-17";
};
plenary = {
pname = "plenary";
@ -531,15 +531,15 @@
};
schemastore = {
pname = "schemastore";
version = "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15";
version = "58a965eedbfe7c358938b0e535ed2d98a4520987";
src = fetchFromGitHub {
owner = "b0o";
repo = "schemastore.nvim";
rev = "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15";
rev = "58a965eedbfe7c358938b0e535ed2d98a4520987";
fetchSubmodules = false;
sha256 = "sha256-Z7rRrsEaPwnnwJpZwYYyWRk7dTNVKORfRSJChp3RKQ4=";
sha256 = "sha256-jS13dXMliCjYNgMVxOJc9Z2bItG6GyzECTYjk63+j7U=";
};
date = "2024-07-15";
date = "2024-07-18";
};
telescope = {
pname = "telescope";
@ -628,27 +628,27 @@
};
trouble = {
pname = "trouble";
version = "bf99ea71a39e322336b7f8be965f86dbf5c65540";
version = "ad8ef38666834e9e438f84bd446657445bc2a71e";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
rev = "bf99ea71a39e322336b7f8be965f86dbf5c65540";
rev = "ad8ef38666834e9e438f84bd446657445bc2a71e";
fetchSubmodules = false;
sha256 = "sha256-RvjgVagdt19tSz7HDwAxLAZojjgsp6z2/GYGty9Ifmg=";
sha256 = "sha256-9bwmXM0xW4IspLym7Er/snOztTvf+Wa3iTCFo5qBt80=";
};
date = "2024-07-15";
date = "2024-07-19";
};
typescript-tools = {
pname = "typescript-tools";
version = "3ecf6b29435dc7979eb5cdf1a9ff11bd65f5ea90";
version = "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7";
src = fetchFromGitHub {
owner = "pmizio";
repo = "typescript-tools.nvim";
rev = "3ecf6b29435dc7979eb5cdf1a9ff11bd65f5ea90";
rev = "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7";
fetchSubmodules = false;
sha256 = "sha256-I6nglwLJB6U4CEL+SXV9RvFowZe7FeK9DN4AVT/qQ7o=";
sha256 = "sha256-8WH/eCff1liDVaezZFvu6RqCtXU4Uwq80BlWiH+tQME=";
};
date = "2024-07-15";
date = "2024-07-18";
};
undotree = {
pname = "undotree";
@ -664,14 +664,14 @@
};
vim-fugitive = {
pname = "vim-fugitive";
version = "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc";
version = "0444df68cd1cdabc7453d6bd84099458327e5513";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc";
rev = "0444df68cd1cdabc7453d6bd84099458327e5513";
fetchSubmodules = false;
sha256 = "sha256-CfwcR1xFUJH3dBfpkyX/sncLopaUPUFPZDfe3aohTNo=";
sha256 = "sha256-NLHaXpPrb4/QuVuTjl6YUUKA3/1r4VCOaNO48Dk9pms=";
};
date = "2024-07-05";
date = "2024-07-18";
};
}

View file

@ -1,20 +0,0 @@
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,
-- hint style, set to 'eol' for end-of-line hints, 'inlay' for inline hints
-- inlay only avalible for 0.10.x
style = "eol",
},
})
require("lspconfig").gopls.setup(require("go.lsp").config())

View file

@ -1,70 +0,0 @@
local null_present, null = pcall(require, "null-ls")
if not null_present then
return
end
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local sources = {
-- general
null.builtins.formatting.treefmt.with({
condition = function(utils)
return utils.root_has_file("treefmt.toml")
end,
}),
-- nix
null.builtins.formatting.nixfmt,
null.builtins.diagnostics.statix,
null.builtins.diagnostics.deadnix,
-- go
null.builtins.formatting.gofumpt,
-- webdev
null.builtins.formatting.prettier.with({
filetypes = {
"html",
"astro",
"vue",
},
}),
-- shell
null.builtins.formatting.shfmt,
-- lua
null.builtins.formatting.stylua,
-- docs
null.builtins.diagnostics.alex,
null.builtins.diagnostics.proselint,
}
null.setup({
sources = sources,
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({
bufnr = bufnr,
filter = function(c)
return c.name == "null-ls"
end,
})
end,
})
end
end,
})
local toggle_formatters = function()
null.toggle({ methods = null.methods.FORMATTING })
end
vim.api.nvim_create_user_command("ToggleFormatters", toggle_formatters, {})

25
flake.lock generated
View file

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1721176539,
"narHash": "sha256-6/6X8f0fNlv8GQT0aBW0H1ntnxnc6jlIdexIsKN6Fwc=",
"lastModified": 1721391717,
"narHash": "sha256-nfHhJMu1JWpVpBBzlOJDYTIpjWR01lpWJWcB6nwV9OE=",
"owner": "isabelroses",
"repo": "beapkgs",
"rev": "7df7c6ea670074aaba583af4faaebd2884297cfb",
"rev": "4907078091cb42b68f89ed1e4854504f3ba2cace",
"type": "github"
},
"original": {
@ -44,7 +44,9 @@
},
"flake-utils": {
"inputs": {
"systems": "systems"
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1710146030,
@ -157,11 +159,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1721138476,
"narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
"type": "github"
},
"original": {
@ -195,7 +197,8 @@
"git-hooks": "git-hooks",
"neovim-nix": "neovim-nix",
"nil": "nil",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"systems": "systems"
}
},
"rust-overlay": {
@ -206,11 +209,11 @@
]
},
"locked": {
"lastModified": 1721096425,
"narHash": "sha256-9/58mnoDCyBHsJZwTg3MfgX3kgVqP/SzGMy0WnnWII8=",
"lastModified": 1721269159,
"narHash": "sha256-eHrGuKZKQb762qdCkrfoyyxXLKumYhiXJca1ig0RftE=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "1c95d396d7395829b5c06bea84fb1dd23169ca42",
"rev": "c3e217122ac55680606d69bc693bdf262f14f602",
"type": "github"
},
"original": {

View file

@ -24,6 +24,14 @@
};
};
beapkgs = {
url = "github:isabelroses/beapkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-compat.follows = "";
};
};
# neovim-nightly-overlay = {
# url = "github:nix-community/neovim-nightly-overlay";
# inputs = {
@ -43,32 +51,24 @@
};
};
beapkgs = {
url = "github:isabelroses/beapkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-compat.follows = "";
};
};
systems.url = "github:nix-systems/default";
# maintenance
flake-utils.url = "github:numtide/flake-utils";
flake-utils = {
url = "github:numtide/flake-utils";
inputs.systems.follows = "systems";
};
};
outputs =
{ nixpkgs, flake-parts, ... }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = import inputs.systems;
imports = [
inputs.neovim-nix.flakeModule
./neovim.nix
] ++ nixpkgs.lib.optional (inputs.git-hooks ? flakeModule) inputs.git-hooks.flakeModule;
] ++ inputs.nixpkgs.lib.optional (inputs.git-hooks ? flakeModule) inputs.git-hooks.flakeModule;
perSystem =
{
@ -80,11 +80,11 @@
...
}:
{
_module.args.pkgs = import nixpkgs {
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [
inputs.nil.overlays.default
inputs.nil.overlays.nil
inputs.beapkgs.overlays.default
];
};
@ -101,11 +101,28 @@
nvim-treesitter = pkgs.callPackage ./pkgs/nvim-treesitter { };
};
devShells.generate-treesitter = pkgs.mkShellNoCC {
packages = with pkgs; [
nvfetcher
(callPackage ./pkgs/nvim-treesitter/neovim.nix { })
];
devShells = {
default = pkgs.mkShellNoCC {
inherit (self'.checks.pre-commit-check) shellHook;
buildInputs = with pkgs; [
self'.formatter
nvfetcher
];
};
generate-treesitter = pkgs.mkShellNoCC {
packages = with pkgs; [
nvfetcher
(writeShellApplication {
name = "generate";
runtimeInputs = [ (callPackage ./pkgs/nvim-treesitter/neovim.nix { }) ];
text = ''
nvim --headless -l ${./pkgs/nvim-treesitter/generate-nvfetcher.lua}
'';
})
];
};
};
}
// lib.optionalAttrs (inputs.git-hooks ? flakeModule) {
@ -120,18 +137,6 @@
stylua.enable = true;
};
};
devShells.default = pkgs.mkShellNoCC {
inherit (self'.checks.pre-commit-check) shellHook;
buildInputs = with pkgs; [
self'.formatter
nil
statix
deadnix
nvfetcher
nix-tree
];
};
};
};
}

View file

@ -14,34 +14,19 @@
paths = with pkgs; [
# external deps
fd
git
gh
ripgrep
# python
ruff
pyright
# lua
stylua
lua-language-server
luaPackages.tl
luaPackages.teal-language-server
# webdev
deno
emmet-language-server
vue-language-server
nodePackages.nodejs
nodePackages."@astrojs/language-server"
nodePackages."@tailwindcss/language-server"
nodePackages.dockerfile-language-server-nodejs
nodePackages.graphql
nodePackages.graphql-language-service-cli
nodePackages.intelephense
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.graphql-language-service-cli
# markdown / latex
ltex-ls
@ -60,13 +45,11 @@
bash-language-server
# etc
emmet-ls
nodePackages.prettier
proselint
jq-lsp # json
taplo # toml
nodePackages.yaml-language-server # yaml
haskell-language-server
nodePackages.dockerfile-language-server-nodejs # docker
];
build =

View file

@ -1,7 +1,7 @@
{
"nvim-treesitter": {
"cargoLocks": null,
"date": "2024-07-17",
"date": "2024-07-19",
"extract": null,
"name": "nvim-treesitter",
"passthru": null,
@ -11,12 +11,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2",
"sha256": "sha256-Q+1TWNkBTpx6KmtyNwzYDhHFEEctJRrGPX60Ah9ebKE=",
"rev": "0ffe62722307f6755d2c7049837cb2cd6d7d275a",
"sha256": "sha256-BXZLzV/NZYh3O+svLpXzaueqpKv35pa2wdcZa1qT6h8=",
"type": "git",
"url": "https://github.com/nvim-treesitter/nvim-treesitter"
},
"version": "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2"
"version": "0ffe62722307f6755d2c7049837cb2cd6d7d275a"
},
"treesitter-grammar-ada": {
"cargoLocks": null,
@ -58,7 +58,7 @@
},
"treesitter-grammar-angular": {
"cargoLocks": null,
"date": "2024-07-15",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-angular",
"passthru": null,
@ -68,12 +68,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "3d7f50e88acc34d7452d6fcec1b11b555da60f00",
"sha256": "sha256-tqDo+esFxDA7170/A13qnsz6VFdyxOn2wAr8juROO3U=",
"rev": "31182d43b062a350d4bd2449f2fc0d5654972be9",
"sha256": "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0=",
"type": "git",
"url": "https://github.com/dlvandenberg/tree-sitter-angular"
},
"version": "3d7f50e88acc34d7452d6fcec1b11b555da60f00"
"version": "31182d43b062a350d4bd2449f2fc0d5654972be9"
},
"treesitter-grammar-apex": {
"cargoLocks": null,
@ -632,7 +632,7 @@
},
"treesitter-grammar-cuda": {
"cargoLocks": null,
"date": "2024-06-22",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-cuda",
"passthru": null,
@ -642,12 +642,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "b93070b5a91ee9537d45e59d741737b1289c5dcc",
"sha256": "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4=",
"rev": "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0",
"sha256": "sha256-h7DqTPWeuYFQ6eUHkpmoSKK1Ki6JQcp9jkKKjy0egXQ=",
"type": "git",
"url": "https://github.com/theHamsta/tree-sitter-cuda"
},
"version": "b93070b5a91ee9537d45e59d741737b1289c5dcc"
"version": "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0"
},
"treesitter-grammar-cue": {
"cargoLocks": null,
@ -784,7 +784,7 @@
},
"treesitter-grammar-djot": {
"cargoLocks": null,
"date": "2024-06-04",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-djot",
"passthru": null,
@ -794,12 +794,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "87bf82874c86dcf563f5521069d603ed50e5f0cc",
"sha256": "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4=",
"rev": "886601b67d1f4690173a4925c214343c30704d32",
"sha256": "sha256-uh41umECO8mIgML4JV5yz2iaNy6h5uLQWodcXvhI/MM=",
"type": "git",
"url": "https://github.com/treeman/tree-sitter-djot"
},
"version": "87bf82874c86dcf563f5521069d603ed50e5f0cc"
"version": "886601b67d1f4690173a4925c214343c30704d32"
},
"treesitter-grammar-dockerfile": {
"cargoLocks": null,
@ -919,6 +919,25 @@
},
"version": "8e635b0b723c620774dfb8abf382a7f531894b40"
},
"treesitter-grammar-editorconfig": {
"cargoLocks": null,
"date": "2024-07-07",
"extract": null,
"name": "treesitter-grammar-editorconfig",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "c5f83685a64117872ae750ce14333a7a1dddcf0b",
"sha256": "sha256-kmQ3+QTwWd/92wL6YS6UchI819eLnD9YfT5TPANvCXA=",
"type": "git",
"url": "https://github.com/ValdezFOmar/tree-sitter-editorconfig"
},
"version": "c5f83685a64117872ae750ce14333a7a1dddcf0b"
},
"treesitter-grammar-eds": {
"cargoLocks": null,
"date": "2024-06-06",
@ -1225,7 +1244,7 @@
},
"treesitter-grammar-fortran": {
"cargoLocks": null,
"date": "2024-07-07",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-fortran",
"passthru": null,
@ -1235,12 +1254,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "dde9829554b831cf6cbf927294f22dfb9a8f0419",
"sha256": "sha256-QvEKisBE4Qrnv1CjeCMhIt/L1BdXEJLCprw/hJoAE20=",
"rev": "6b633433fb3f132f21250cf8e8be76d5a6389b7e",
"sha256": "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI=",
"type": "git",
"url": "https://github.com/stadelmanma/tree-sitter-fortran"
},
"version": "dde9829554b831cf6cbf927294f22dfb9a8f0419"
"version": "6b633433fb3f132f21250cf8e8be76d5a6389b7e"
},
"treesitter-grammar-fsh": {
"cargoLocks": null,
@ -1546,6 +1565,25 @@
},
"version": "7ee8d928db5202f6831a78f8112fd693bf69f98b"
},
"treesitter-grammar-goctl": {
"cargoLocks": null,
"date": "2024-07-07",
"extract": null,
"name": "treesitter-grammar-goctl",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3",
"sha256": "sha256-4I0T+CoMCo3e7hkpdR+ipMol0THbJYg+UXAnIa0o5Ns=",
"type": "git",
"url": "https://github.com/chaozwn/tree-sitter-goctl"
},
"version": "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"
},
"treesitter-grammar-godot_resource": {
"cargoLocks": null,
"date": "2024-04-01",
@ -2044,7 +2082,7 @@
},
"treesitter-grammar-idl": {
"cargoLocks": null,
"date": "2024-07-16",
"date": "2024-07-19",
"extract": null,
"name": "treesitter-grammar-idl",
"passthru": null,
@ -2054,12 +2092,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "556f2878db1c26da33a921df8226f3268fadef75",
"sha256": "sha256-WXF+Opb5GrMqRErJvmPgzTrVnHfstfZKZ+4tWbULLGo=",
"rev": "be067aa6146d88ac7b6276f72fc22a681f744ccb",
"sha256": "sha256-DHRq9JRYzxe0mrgZnqG+hyKyIcLZ8VstmiwIJoDMK9w=",
"type": "git",
"url": "https://github.com/cathaysia/tree-sitter-idl"
},
"version": "556f2878db1c26da33a921df8226f3268fadef75"
"version": "be067aa6146d88ac7b6276f72fc22a681f744ccb"
},
"treesitter-grammar-ini": {
"cargoLocks": null,
@ -2443,7 +2481,7 @@
},
"treesitter-grammar-latex": {
"cargoLocks": null,
"date": "2024-06-23",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-latex",
"passthru": {
@ -2455,12 +2493,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4",
"sha256": "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI=",
"rev": "107435ada4c4c422ba4f951336b5e566b86ac3ca",
"sha256": "sha256-bIWrwFOZ8oHI4O25JlNi1FDz+EkzsZEju4q1zFcuQq4=",
"type": "git",
"url": "https://github.com/latex-lsp/tree-sitter-latex"
},
"version": "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"
"version": "107435ada4c4c422ba4f951336b5e566b86ac3ca"
},
"treesitter-grammar-ledger": {
"cargoLocks": null,
@ -3173,7 +3211,7 @@
"rev": "a9ee969dec5b2e3b2ccccc5954fec04100c7619e",
"sha256": "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80=",
"type": "git",
"url": "https://github.com/Isopod/tree-sitter-pascal.git"
"url": "https://github.com/Isopod/tree-sitter-pascal"
},
"version": "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"
},
@ -3428,6 +3466,48 @@
},
"version": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
},
"treesitter-grammar-problog": {
"cargoLocks": null,
"date": "2024-07-01",
"extract": null,
"name": "treesitter-grammar-problog",
"passthru": {
"location": "grammars/problog"
},
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "d8bc22c007825d3af3d62b4326f9d8f9ca529974",
"sha256": "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=",
"type": "git",
"url": "https://github.com/foxyseta/tree-sitter-prolog"
},
"version": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
},
"treesitter-grammar-prolog": {
"cargoLocks": null,
"date": "2024-07-01",
"extract": null,
"name": "treesitter-grammar-prolog",
"passthru": {
"location": "grammars/prolog"
},
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "d8bc22c007825d3af3d62b4326f9d8f9ca529974",
"sha256": "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=",
"type": "git",
"url": "https://github.com/foxyseta/tree-sitter-prolog"
},
"version": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
},
"treesitter-grammar-promql": {
"cargoLocks": null,
"date": "2023-08-13",
@ -3734,6 +3814,25 @@
},
"version": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
},
"treesitter-grammar-ralph": {
"cargoLocks": null,
"date": "2024-06-24",
"extract": null,
"name": "treesitter-grammar-ralph",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "f6d81bf7a4599c77388035439cf5801cd461ff77",
"sha256": "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA=",
"type": "git",
"url": "https://github.com/alephium/tree-sitter-ralph"
},
"version": "f6d81bf7a4599c77388035439cf5801cd461ff77"
},
"treesitter-grammar-rasi": {
"cargoLocks": null,
"date": "2024-05-21",
@ -3905,9 +4004,28 @@
},
"version": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
},
"treesitter-grammar-robots": {
"cargoLocks": null,
"date": "2024-06-29",
"extract": null,
"name": "treesitter-grammar-robots",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62",
"sha256": "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME=",
"type": "git",
"url": "https://github.com/opa-oz/tree-sitter-robots-txt"
},
"version": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
},
"treesitter-grammar-roc": {
"cargoLocks": null,
"date": "2024-05-22",
"date": "2024-06-26",
"extract": null,
"name": "treesitter-grammar-roc",
"passthru": null,
@ -3917,12 +4035,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "df46a85abda9f948d38f5d4e3684cec49c42fef2",
"sha256": "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA=",
"rev": "6ea64b6434a45472bd87b0772fd84a017de0a557",
"sha256": "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M=",
"type": "git",
"url": "https://github.com/nat-418/tree-sitter-roc"
"url": "https://github.com/faldor20/tree-sitter-roc"
},
"version": "df46a85abda9f948d38f5d4e3684cec49c42fef2"
"version": "6ea64b6434a45472bd87b0772fd84a017de0a557"
},
"treesitter-grammar-ron": {
"cargoLocks": null,
@ -4002,7 +4120,7 @@
},
"treesitter-grammar-scala": {
"cargoLocks": null,
"date": "2024-06-30",
"date": "2024-07-17",
"extract": null,
"name": "treesitter-grammar-scala",
"passthru": null,
@ -4012,12 +4130,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "599d12b59fed092f5a3d4a7019fd85d90cb39ec1",
"sha256": "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw=",
"rev": "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8",
"sha256": "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw=",
"type": "git",
"url": "https://github.com/tree-sitter/tree-sitter-scala"
},
"version": "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"
"version": "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"
},
"treesitter-grammar-scfg": {
"cargoLocks": null,
@ -4036,7 +4154,7 @@
"rev": "a5512800ea0220da4abbae61b8aea8423d1549aa",
"sha256": "sha256-Je6taNzniyd1c+2NRCF7TOvnpeW4qhYYhdAEcgpDOAA=",
"type": "git",
"url": "https://git.sr.ht/~rockorager/tree-sitter-scfg"
"url": "https://github.com/rockorager/tree-sitter-scfg"
},
"version": "a5512800ea0220da4abbae61b8aea8423d1549aa"
},
@ -4099,7 +4217,7 @@
},
"treesitter-grammar-slint": {
"cargoLocks": null,
"date": "2024-06-03",
"date": "2024-07-18",
"extract": null,
"name": "treesitter-grammar-slint",
"passthru": null,
@ -4109,12 +4227,12 @@
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63",
"sha256": "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY=",
"rev": "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74",
"sha256": "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA=",
"type": "git",
"url": "https://github.com/slint-ui/tree-sitter-slint"
},
"version": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
"version": "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"
},
"treesitter-grammar-smali": {
"cargoLocks": null,
@ -4268,7 +4386,7 @@
"rev": "d853661ca680d8ff7f8d800182d5782b61d0dd58",
"sha256": "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=",
"type": "git",
"url": "https://github.com/BonaBeavis/tree-sitter-sparql"
"url": "https://github.com/GordianDziwis/tree-sitter-sparql"
},
"version": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
},
@ -4502,6 +4620,25 @@
},
"version": "1af543a96d060b1f808982037bfc54cc02218edd"
},
"treesitter-grammar-systemverilog": {
"cargoLocks": null,
"date": "2024-06-24",
"extract": null,
"name": "treesitter-grammar-systemverilog",
"passthru": null,
"pinned": false,
"src": {
"deepClone": false,
"fetchSubmodules": false,
"leaveDotGit": false,
"name": null,
"rev": "a478beb76be72fa8f305f5fe9cc6141ac91b91a4",
"sha256": "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM=",
"type": "git",
"url": "https://github.com/zhangwwpeng/tree-sitter-systemverilog"
},
"version": "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"
},
"treesitter-grammar-t32": {
"cargoLocks": null,
"date": "2024-04-13",
@ -4749,7 +4886,7 @@
"rev": "3937c5cd105ec4127448651a21aef45f52d19609",
"sha256": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=",
"type": "git",
"url": "https://github.com/arnarg/tree-sitter-todotxt.git"
"url": "https://github.com/arnarg/tree-sitter-todotxt"
},
"version": "3937c5cd105ec4127448651a21aef45f52d19609"
},
@ -4829,7 +4966,7 @@
"rev": "7f789ea7ef765080f71a298fc96b7c957fa24422",
"sha256": "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=",
"type": "git",
"url": "https://github.com/BonaBeavis/tree-sitter-turtle"
"url": "https://github.com/GordianDziwis/tree-sitter-turtle"
},
"version": "7f789ea7ef765080f71a298fc96b7c957fa24422"
},

View file

@ -3,16 +3,16 @@
{
nvim-treesitter = {
pname = "nvim-treesitter";
version = "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2";
version = "0ffe62722307f6755d2c7049837cb2cd6d7d275a";
src = fetchgit {
url = "https://github.com/nvim-treesitter/nvim-treesitter";
rev = "0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2";
rev = "0ffe62722307f6755d2c7049837cb2cd6d7d275a";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-Q+1TWNkBTpx6KmtyNwzYDhHFEEctJRrGPX60Ah9ebKE=";
sha256 = "sha256-BXZLzV/NZYh3O+svLpXzaueqpKv35pa2wdcZa1qT6h8=";
};
date = "2024-07-17";
date = "2024-07-19";
};
treesitter-grammar-ada = {
pname = "treesitter-grammar-ada";
@ -42,16 +42,16 @@
};
treesitter-grammar-angular = {
pname = "treesitter-grammar-angular";
version = "3d7f50e88acc34d7452d6fcec1b11b555da60f00";
version = "31182d43b062a350d4bd2449f2fc0d5654972be9";
src = fetchgit {
url = "https://github.com/dlvandenberg/tree-sitter-angular";
rev = "3d7f50e88acc34d7452d6fcec1b11b555da60f00";
rev = "31182d43b062a350d4bd2449f2fc0d5654972be9";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-tqDo+esFxDA7170/A13qnsz6VFdyxOn2wAr8juROO3U=";
sha256 = "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0=";
};
date = "2024-07-15";
date = "2024-07-18";
};
treesitter-grammar-apex = {
pname = "treesitter-grammar-apex";
@ -434,16 +434,16 @@
};
treesitter-grammar-cuda = {
pname = "treesitter-grammar-cuda";
version = "b93070b5a91ee9537d45e59d741737b1289c5dcc";
version = "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0";
src = fetchgit {
url = "https://github.com/theHamsta/tree-sitter-cuda";
rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc";
rev = "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4=";
sha256 = "sha256-h7DqTPWeuYFQ6eUHkpmoSKK1Ki6JQcp9jkKKjy0egXQ=";
};
date = "2024-06-22";
date = "2024-07-18";
};
treesitter-grammar-cue = {
pname = "treesitter-grammar-cue";
@ -538,16 +538,16 @@
};
treesitter-grammar-djot = {
pname = "treesitter-grammar-djot";
version = "87bf82874c86dcf563f5521069d603ed50e5f0cc";
version = "886601b67d1f4690173a4925c214343c30704d32";
src = fetchgit {
url = "https://github.com/treeman/tree-sitter-djot";
rev = "87bf82874c86dcf563f5521069d603ed50e5f0cc";
rev = "886601b67d1f4690173a4925c214343c30704d32";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4=";
sha256 = "sha256-uh41umECO8mIgML4JV5yz2iaNy6h5uLQWodcXvhI/MM=";
};
date = "2024-06-04";
date = "2024-07-18";
};
treesitter-grammar-dockerfile = {
pname = "treesitter-grammar-dockerfile";
@ -629,6 +629,19 @@
location = "crates/tree-sitter-ebnf";
date = "2023-02-06";
};
treesitter-grammar-editorconfig = {
pname = "treesitter-grammar-editorconfig";
version = "c5f83685a64117872ae750ce14333a7a1dddcf0b";
src = fetchgit {
url = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
rev = "c5f83685a64117872ae750ce14333a7a1dddcf0b";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-kmQ3+QTwWd/92wL6YS6UchI819eLnD9YfT5TPANvCXA=";
};
date = "2024-07-07";
};
treesitter-grammar-eds = {
pname = "treesitter-grammar-eds";
version = "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d";
@ -839,16 +852,16 @@
};
treesitter-grammar-fortran = {
pname = "treesitter-grammar-fortran";
version = "dde9829554b831cf6cbf927294f22dfb9a8f0419";
version = "6b633433fb3f132f21250cf8e8be76d5a6389b7e";
src = fetchgit {
url = "https://github.com/stadelmanma/tree-sitter-fortran";
rev = "dde9829554b831cf6cbf927294f22dfb9a8f0419";
rev = "6b633433fb3f132f21250cf8e8be76d5a6389b7e";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-QvEKisBE4Qrnv1CjeCMhIt/L1BdXEJLCprw/hJoAE20=";
sha256 = "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI=";
};
date = "2024-07-07";
date = "2024-07-18";
};
treesitter-grammar-fsh = {
pname = "treesitter-grammar-fsh";
@ -1058,6 +1071,19 @@
};
date = "2024-05-10";
};
treesitter-grammar-goctl = {
pname = "treesitter-grammar-goctl";
version = "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3";
src = fetchgit {
url = "https://github.com/chaozwn/tree-sitter-goctl";
rev = "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-4I0T+CoMCo3e7hkpdR+ipMol0THbJYg+UXAnIa0o5Ns=";
};
date = "2024-07-07";
};
treesitter-grammar-godot_resource = {
pname = "treesitter-grammar-godot_resource";
version = "2ffb90de47417018651fc3b970e5f6b67214dc9d";
@ -1399,16 +1425,16 @@
};
treesitter-grammar-idl = {
pname = "treesitter-grammar-idl";
version = "556f2878db1c26da33a921df8226f3268fadef75";
version = "be067aa6146d88ac7b6276f72fc22a681f744ccb";
src = fetchgit {
url = "https://github.com/cathaysia/tree-sitter-idl";
rev = "556f2878db1c26da33a921df8226f3268fadef75";
rev = "be067aa6146d88ac7b6276f72fc22a681f744ccb";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-WXF+Opb5GrMqRErJvmPgzTrVnHfstfZKZ+4tWbULLGo=";
sha256 = "sha256-DHRq9JRYzxe0mrgZnqG+hyKyIcLZ8VstmiwIJoDMK9w=";
};
date = "2024-07-16";
date = "2024-07-19";
};
treesitter-grammar-ini = {
pname = "treesitter-grammar-ini";
@ -1672,17 +1698,17 @@
};
treesitter-grammar-latex = {
pname = "treesitter-grammar-latex";
version = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4";
version = "107435ada4c4c422ba4f951336b5e566b86ac3ca";
src = fetchgit {
url = "https://github.com/latex-lsp/tree-sitter-latex";
rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4";
rev = "107435ada4c4c422ba4f951336b5e566b86ac3ca";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI=";
sha256 = "sha256-bIWrwFOZ8oHI4O25JlNi1FDz+EkzsZEju4q1zFcuQq4=";
};
generate = "true";
date = "2024-06-23";
date = "2024-07-18";
};
treesitter-grammar-ledger = {
pname = "treesitter-grammar-ledger";
@ -2162,7 +2188,7 @@
pname = "treesitter-grammar-pascal";
version = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e";
src = fetchgit {
url = "https://github.com/Isopod/tree-sitter-pascal.git";
url = "https://github.com/Isopod/tree-sitter-pascal";
rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e";
fetchSubmodules = false;
deepClone = false;
@ -2342,6 +2368,34 @@
};
date = "2023-01-05";
};
treesitter-grammar-problog = {
pname = "treesitter-grammar-problog";
version = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
src = fetchgit {
url = "https://github.com/foxyseta/tree-sitter-prolog";
rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=";
};
location = "grammars/problog";
date = "2024-07-01";
};
treesitter-grammar-prolog = {
pname = "treesitter-grammar-prolog";
version = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
src = fetchgit {
url = "https://github.com/foxyseta/tree-sitter-prolog";
rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=";
};
location = "grammars/prolog";
date = "2024-07-01";
};
treesitter-grammar-promql = {
pname = "treesitter-grammar-promql";
version = "77625d78eebc3ffc44d114a07b2f348dff3061b0";
@ -2551,6 +2605,19 @@
};
date = "2024-04-12";
};
treesitter-grammar-ralph = {
pname = "treesitter-grammar-ralph";
version = "f6d81bf7a4599c77388035439cf5801cd461ff77";
src = fetchgit {
url = "https://github.com/alephium/tree-sitter-ralph";
rev = "f6d81bf7a4599c77388035439cf5801cd461ff77";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA=";
};
date = "2024-06-24";
};
treesitter-grammar-rasi = {
pname = "treesitter-grammar-rasi";
version = "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa";
@ -2668,18 +2735,31 @@
};
date = "2023-08-16";
};
treesitter-grammar-roc = {
pname = "treesitter-grammar-roc";
version = "df46a85abda9f948d38f5d4e3684cec49c42fef2";
treesitter-grammar-robots = {
pname = "treesitter-grammar-robots";
version = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62";
src = fetchgit {
url = "https://github.com/nat-418/tree-sitter-roc";
rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2";
url = "https://github.com/opa-oz/tree-sitter-robots-txt";
rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA=";
sha256 = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME=";
};
date = "2024-05-22";
date = "2024-06-29";
};
treesitter-grammar-roc = {
pname = "treesitter-grammar-roc";
version = "6ea64b6434a45472bd87b0772fd84a017de0a557";
src = fetchgit {
url = "https://github.com/faldor20/tree-sitter-roc";
rev = "6ea64b6434a45472bd87b0772fd84a017de0a557";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M=";
};
date = "2024-06-26";
};
treesitter-grammar-ron = {
pname = "treesitter-grammar-ron";
@ -2735,22 +2815,22 @@
};
treesitter-grammar-scala = {
pname = "treesitter-grammar-scala";
version = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1";
version = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8";
src = fetchgit {
url = "https://github.com/tree-sitter/tree-sitter-scala";
rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1";
rev = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw=";
sha256 = "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw=";
};
date = "2024-06-30";
date = "2024-07-17";
};
treesitter-grammar-scfg = {
pname = "treesitter-grammar-scfg";
version = "a5512800ea0220da4abbae61b8aea8423d1549aa";
src = fetchgit {
url = "https://git.sr.ht/~rockorager/tree-sitter-scfg";
url = "https://github.com/rockorager/tree-sitter-scfg";
rev = "a5512800ea0220da4abbae61b8aea8423d1549aa";
fetchSubmodules = false;
deepClone = false;
@ -2801,16 +2881,16 @@
};
treesitter-grammar-slint = {
pname = "treesitter-grammar-slint";
version = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63";
version = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74";
src = fetchgit {
url = "https://github.com/slint-ui/tree-sitter-slint";
rev = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63";
rev = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY=";
sha256 = "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA=";
};
date = "2024-06-03";
date = "2024-07-18";
};
treesitter-grammar-smali = {
pname = "treesitter-grammar-smali";
@ -2909,7 +2989,7 @@
pname = "treesitter-grammar-sparql";
version = "d853661ca680d8ff7f8d800182d5782b61d0dd58";
src = fetchgit {
url = "https://github.com/BonaBeavis/tree-sitter-sparql";
url = "https://github.com/GordianDziwis/tree-sitter-sparql";
rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58";
fetchSubmodules = false;
deepClone = false;
@ -3075,6 +3155,19 @@
};
date = "2023-07-12";
};
treesitter-grammar-systemverilog = {
pname = "treesitter-grammar-systemverilog";
version = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4";
src = fetchgit {
url = "https://github.com/zhangwwpeng/tree-sitter-systemverilog";
rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4";
fetchSubmodules = false;
deepClone = false;
leaveDotGit = false;
sha256 = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM=";
};
date = "2024-06-24";
};
treesitter-grammar-t32 = {
pname = "treesitter-grammar-t32";
version = "6182836f4128725f1e74ce986840d7317021a015";
@ -3237,7 +3330,7 @@
pname = "treesitter-grammar-todotxt";
version = "3937c5cd105ec4127448651a21aef45f52d19609";
src = fetchgit {
url = "https://github.com/arnarg/tree-sitter-todotxt.git";
url = "https://github.com/arnarg/tree-sitter-todotxt";
rev = "3937c5cd105ec4127448651a21aef45f52d19609";
fetchSubmodules = false;
deepClone = false;
@ -3291,7 +3384,7 @@
pname = "treesitter-grammar-turtle";
version = "7f789ea7ef765080f71a298fc96b7c957fa24422";
src = fetchgit {
url = "https://github.com/BonaBeavis/tree-sitter-turtle";
url = "https://github.com/GordianDziwis/tree-sitter-turtle";
rev = "7f789ea7ef765080f71a298fc96b7c957fa24422";
fetchSubmodules = false;
deepClone = false;

View file

@ -198,6 +198,10 @@ src.git = "https://github.com/RubixDev/ebnf"
[treesitter-grammar-ebnf.passthru]
location = "crates/tree-sitter-ebnf"
[treesitter-grammar-editorconfig]
fetch.git = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"
src.git = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"
[treesitter-grammar-eds]
fetch.git = "https://github.com/uyha/tree-sitter-eds"
src.git = "https://github.com/uyha/tree-sitter-eds"
@ -330,6 +334,10 @@ src.git = "https://github.com/dpezto/tree-sitter-gnuplot"
fetch.git = "https://github.com/tree-sitter/tree-sitter-go"
src.git = "https://github.com/tree-sitter/tree-sitter-go"
[treesitter-grammar-goctl]
fetch.git = "https://github.com/chaozwn/tree-sitter-goctl"
src.git = "https://github.com/chaozwn/tree-sitter-goctl"
[treesitter-grammar-godot_resource]
fetch.git = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"
src.git = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"
@ -683,8 +691,8 @@ fetch.git = "https://github.com/milisims/tree-sitter-org"
src.git = "https://github.com/milisims/tree-sitter-org"
[treesitter-grammar-pascal]
fetch.git = "https://github.com/Isopod/tree-sitter-pascal.git"
src.git = "https://github.com/Isopod/tree-sitter-pascal.git"
fetch.git = "https://github.com/Isopod/tree-sitter-pascal"
src.git = "https://github.com/Isopod/tree-sitter-pascal"
[treesitter-grammar-passwd]
fetch.git = "https://github.com/ath3/tree-sitter-passwd"
@ -744,6 +752,18 @@ src.git = "https://github.com/ObserverOfTime/tree-sitter-printf"
fetch.git = "https://github.com/victorhqc/tree-sitter-prisma"
src.git = "https://github.com/victorhqc/tree-sitter-prisma"
[treesitter-grammar-problog]
fetch.git = "https://github.com/foxyseta/tree-sitter-prolog"
src.git = "https://github.com/foxyseta/tree-sitter-prolog"
[treesitter-grammar-problog.passthru]
location = "grammars/problog"
[treesitter-grammar-prolog]
fetch.git = "https://github.com/foxyseta/tree-sitter-prolog"
src.git = "https://github.com/foxyseta/tree-sitter-prolog"
[treesitter-grammar-prolog.passthru]
location = "grammars/prolog"
[treesitter-grammar-promql]
fetch.git = "https://github.com/MichaHoffmann/tree-sitter-promql"
src.git = "https://github.com/MichaHoffmann/tree-sitter-promql"
@ -810,6 +830,10 @@ src.git = "https://github.com/r-lib/tree-sitter-r"
fetch.git = "https://github.com/6cdh/tree-sitter-racket"
src.git = "https://github.com/6cdh/tree-sitter-racket"
[treesitter-grammar-ralph]
fetch.git = "https://github.com/alephium/tree-sitter-ralph"
src.git = "https://github.com/alephium/tree-sitter-ralph"
[treesitter-grammar-rasi]
fetch.git = "https://github.com/Fymyte/tree-sitter-rasi"
src.git = "https://github.com/Fymyte/tree-sitter-rasi"
@ -846,9 +870,13 @@ src.git = "https://github.com/bamonroe/tree-sitter-rnoweb"
fetch.git = "https://github.com/Hubro/tree-sitter-robot"
src.git = "https://github.com/Hubro/tree-sitter-robot"
[treesitter-grammar-robots]
fetch.git = "https://github.com/opa-oz/tree-sitter-robots-txt"
src.git = "https://github.com/opa-oz/tree-sitter-robots-txt"
[treesitter-grammar-roc]
fetch.git = "https://github.com/nat-418/tree-sitter-roc"
src.git = "https://github.com/nat-418/tree-sitter-roc"
fetch.git = "https://github.com/faldor20/tree-sitter-roc"
src.git = "https://github.com/faldor20/tree-sitter-roc"
[treesitter-grammar-ron]
fetch.git = "https://github.com/amaanq/tree-sitter-ron"
@ -871,8 +899,8 @@ fetch.git = "https://github.com/tree-sitter/tree-sitter-scala"
src.git = "https://github.com/tree-sitter/tree-sitter-scala"
[treesitter-grammar-scfg]
fetch.git = "https://git.sr.ht/~rockorager/tree-sitter-scfg"
src.git = "https://git.sr.ht/~rockorager/tree-sitter-scfg"
fetch.git = "https://github.com/rockorager/tree-sitter-scfg"
src.git = "https://github.com/rockorager/tree-sitter-scfg"
[treesitter-grammar-scfg.passthru]
generate = "true"
@ -925,8 +953,8 @@ fetch.git = "https://github.com/nilshelmig/tree-sitter-sourcepawn"
src.git = "https://github.com/nilshelmig/tree-sitter-sourcepawn"
[treesitter-grammar-sparql]
fetch.git = "https://github.com/BonaBeavis/tree-sitter-sparql"
src.git = "https://github.com/BonaBeavis/tree-sitter-sparql"
fetch.git = "https://github.com/GordianDziwis/tree-sitter-sparql"
src.git = "https://github.com/GordianDziwis/tree-sitter-sparql"
[treesitter-grammar-sql]
fetch.git = "https://github.com/derekstride/tree-sitter-sql"
@ -979,6 +1007,10 @@ src.git = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc"
fetch.git = "https://github.com/ok-ryoko/tree-sitter-systemtap"
src.git = "https://github.com/ok-ryoko/tree-sitter-systemtap"
[treesitter-grammar-systemverilog]
fetch.git = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"
src.git = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"
[treesitter-grammar-t32]
fetch.git = "https://gitlab.com/xasc/tree-sitter-t32.git"
src.git = "https://gitlab.com/xasc/tree-sitter-t32.git"
@ -1032,8 +1064,8 @@ fetch.git = "https://github.com/Freed-Wu/tree-sitter-tmux"
src.git = "https://github.com/Freed-Wu/tree-sitter-tmux"
[treesitter-grammar-todotxt]
fetch.git = "https://github.com/arnarg/tree-sitter-todotxt.git"
src.git = "https://github.com/arnarg/tree-sitter-todotxt.git"
fetch.git = "https://github.com/arnarg/tree-sitter-todotxt"
src.git = "https://github.com/arnarg/tree-sitter-todotxt"
[treesitter-grammar-toml]
fetch.git = "https://github.com/tree-sitter-grammars/tree-sitter-toml"
@ -1052,8 +1084,8 @@ src.git = "https://github.com/tree-sitter/tree-sitter-typescript"
location = "tsx"
[treesitter-grammar-turtle]
fetch.git = "https://github.com/BonaBeavis/tree-sitter-turtle"
src.git = "https://github.com/BonaBeavis/tree-sitter-turtle"
fetch.git = "https://github.com/GordianDziwis/tree-sitter-turtle"
src.git = "https://github.com/GordianDziwis/tree-sitter-turtle"
[treesitter-grammar-twig]
fetch.git = "https://github.com/gbprod/tree-sitter-twig"

View file

@ -205,7 +205,6 @@ rec {
package = (pkgs.callPackage ../pkgs/nvim-treesitter { }).override {
grammars = [
"astro"
"awk"
"bash"
"c"
"cpp"
@ -213,7 +212,6 @@ rec {
"csv"
"diff"
"dockerfile"
"git_config"
"git_rebase"
"gitattributes"
"gitcommit"
@ -222,7 +220,6 @@ rec {
"gomod"
"gosum"
"gotmpl"
"gpg"
"graphql"
"haskell"
"html"
@ -239,7 +236,6 @@ rec {
"nu"
"php"
"php_only"
"pug"
"python"
"rust"
"scss"
@ -249,7 +245,6 @@ rec {
"tsx"
"typescript"
"vim"
"vimdoc"
"vue"
"yaml"
"yuck"
@ -330,6 +325,7 @@ rec {
# misc
undotree = {
src = srcs.undotree;
event = "VeryLazy";
config = ''
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
'';
@ -363,19 +359,19 @@ rec {
# "code-action-menu-warning-message"
# "Trouble"
# ];
# event = "VeryLazy";
# };
# cool snippets saving
sayama-nvim = {
src = srcs.sayama-nvim;
event = "VeryLazy";
config.dir = "$XDG_DATA_HOME/zzz";
};
freeze = {
src = srcs.freeze-nvim;
paths = [ pkgs.charm-freeze ];
event = "VeryLazy";
lazy = true;
config = ./freeze.lua;
};
@ -389,6 +385,13 @@ rec {
paths = [ pkgs.lazygit ];
};
# discord integration
presence = {
src = srcs.presence;
event = "VeryLazy";
config = ./presence.lua;
};
# deps
plenary.src = srcs.plenary;

View file

@ -150,8 +150,7 @@ return function()
local common = { capabilities = capabilities }
require("isabel.lsp.go")
require("isabel.lsp.null-ls")
-- setup python
pcall(require("py_lsp").setup, common)
require("typescript-tools").setup({
@ -322,4 +321,96 @@ return function()
lspconfig[server].setup(vim.tbl_extend("force", common, config))
end
end
-- null ls stuff
local null_present, null = pcall(require, "null-ls")
if not null_present then
return
end
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local sources = {
-- general
null.builtins.formatting.treefmt.with({
condition = function(utils)
return utils.root_has_file("treefmt.toml")
end,
}),
-- nix
null.builtins.formatting.nixfmt,
null.builtins.diagnostics.statix,
null.builtins.diagnostics.deadnix,
-- go
null.builtins.formatting.gofumpt,
-- webdev
null.builtins.formatting.prettier.with({
filetypes = {
"html",
"astro",
"vue",
},
}),
-- shell
null.builtins.formatting.shfmt,
-- lua
null.builtins.formatting.stylua,
-- docs
null.builtins.diagnostics.alex,
null.builtins.diagnostics.proselint,
}
null.setup({
sources = sources,
on_attach = function(client, bufnr)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
vim.api.nvim_create_autocmd("BufWritePre", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.format({
bufnr = bufnr,
filter = function(c)
return c.name == "null-ls"
end,
})
end,
})
end
end,
})
local toggle_formatters = function()
null.toggle({ methods = null.methods.FORMATTING })
end
vim.api.nvim_create_user_command("ToggleFormatters", toggle_formatters, {})
-- 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

66
plugins/presence.lua Normal file
View file

@ -0,0 +1,66 @@
return function()
require("presence").setup({
auto_update = true,
neovim_image_text = "neovim",
-- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
blacklist = {},
show_time = false,
-- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`,
-- or a function(buffer: string, repo_url: string|nil): table)
--
-- we have to reimplement this in my repo beacuse it breaks when using custom urls, so i have a check to alter the url based on what it provides
buttons = function(_, parent_dirpath)
-- Retrieve the git repository URL
local repo_url
if parent_dirpath then
-- Escape quotes in the file path
local path = parent_dirpath:gsub([["]], [[\"]])
local git_url_cmd = "git config --get remote.origin.url"
local cmd = string.format([[cd "%s" && %s]], path, git_url_cmd)
-- Trim and coerce empty string value to nil
repo_url = vim.trim(vim.fn.system(cmd))
repo_url = repo_url ~= "" and repo_url or nil
end
-- Proceed if repo_url is valid
if repo_url then
-- Handle short SSH syntax
local domain, project = repo_url:match("^git@(.+):(.+)$")
if domain and project then
repo_url = string.format("https://%s/%s", domain, project)
end
-- Custom protocols
local custom_protocols = {
github = "https://github.com/",
gitlab = "https://gitlab.com/",
aur = "https://aur.archlinux.org/",
srht = "https://git.sr.ht/",
codeberg = "https://codeberg.org/",
me = "https://git.isabelroses.com/",
aux = "https://git.auxolotl.org/",
}
-- Check if repo URL uses a valid custom protocol
local protocol, relative = repo_url:match("^(.-):(.+)$")
if custom_protocols[protocol] and relative then
repo_url = custom_protocols[protocol] .. relative
return { { label = "View Repository", url = repo_url } }
end
-- Check if repo URL uses a valid standard protocol
local protocols = { "ftp", "git", "http", "https", "ssh" }
protocol, relative = repo_url:match("^(.+)://(.+)$")
if protocol and relative then
if vim.tbl_contains(protocols, protocol) then
return { { label = "View Repository", url = repo_url } }
end
end
end
return nil
end,
})
end