Compare commits
3 Commits
22b2647aea
...
0811207844
Author | SHA1 | Date | |
---|---|---|---|
0811207844 | |||
f8d9064a6d | |||
f509a2ba87 |
6
nix/base-system/flake.lock
generated
6
nix/base-system/flake.lock
generated
@ -1818,11 +1818,11 @@
|
|||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746152631,
|
"lastModified": 1747312588,
|
||||||
"narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=",
|
"narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3",
|
"rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -292,6 +292,7 @@ EOF";
|
|||||||
uv = unstablePkgs.uv;
|
uv = unstablePkgs.uv;
|
||||||
quint = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint";
|
quint = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint";
|
||||||
quint-lsp = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint-language-server";
|
quint-lsp = (pkgs.callPackage ../packages/quint/default.nix {})."@informalsystems/quint-language-server";
|
||||||
|
ollama = unstablePkgs.ollama;
|
||||||
})
|
})
|
||||||
rust-overlay
|
rust-overlay
|
||||||
];
|
];
|
||||||
|
@ -43,6 +43,23 @@ vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ "BufNewfile", "BufRead" }, {
|
||||||
|
callback = function(args)
|
||||||
|
-- If treesitter supports this filetype then use the treesitter fold expression
|
||||||
|
local ft = vim.bo.filetype
|
||||||
|
if ft and ft ~= "" then
|
||||||
|
-- Safely check if a parser exists for this filetype
|
||||||
|
local has_parser = pcall(function() return vim.treesitter.language.inspect(ft) end)
|
||||||
|
if has_parser then
|
||||||
|
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
|
||||||
|
vim.wo.foldmethod = 'expr'
|
||||||
|
vim.wo.foldlevel = 3
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
au BufNewFile,BufRead *Makefile,*.mk set noexpandtab
|
au BufNewFile,BufRead *Makefile,*.mk set noexpandtab
|
||||||
]])
|
]])
|
||||||
@ -320,31 +337,16 @@ require('nvim-treesitter.configs').setup {
|
|||||||
extended_mode = true,
|
extended_mode = true,
|
||||||
max_file_lines = nil,
|
max_file_lines = nil,
|
||||||
},
|
},
|
||||||
--textobjects = {
|
textobjects = { enable = true },
|
||||||
-- enable = true,
|
incremental_selection = {
|
||||||
-- select = {
|
enable = true,
|
||||||
-- enable = true,
|
keymaps = {
|
||||||
-- lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
|
init_selection = '<Leader>c',
|
||||||
-- keymaps = {
|
node_incremental = '<Leader>c',
|
||||||
-- -- You can use the capture groups defined in textobjects.scm
|
scope_incremental = '<Leader>ci',
|
||||||
-- ['aa'] = '@parameter.outer',
|
node_decremental = '<Leader>cx',
|
||||||
-- ['ia'] = '@parameter.inner',
|
},
|
||||||
-- ['af'] = '@function.outer',
|
},
|
||||||
-- ['if'] = '@function.inner',
|
|
||||||
-- ['ac'] = '@class.outer',
|
|
||||||
-- ['ic'] = '@class.inner',
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
--},
|
|
||||||
--incremental_selection = {
|
|
||||||
-- enable = true,
|
|
||||||
-- keymaps = {
|
|
||||||
-- init_selection = '<Leader>c',
|
|
||||||
-- node_incremental = '<Leader>c',
|
|
||||||
-- scope_incremental = '<Leader>ci',
|
|
||||||
-- node_decremental = '<Leader>cx',
|
|
||||||
-- },
|
|
||||||
--},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
require 'treesitter-context'.setup {
|
require 'treesitter-context'.setup {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user