Compare commits

..

No commits in common. "fb7cf9e2809f339ad48e0b2251e9a01815499fe3" and "febc33faeeb9a69d058329e6d81f1a82bc84ae4d" have entirely different histories.

4 changed files with 59 additions and 92 deletions

View File

@ -161,11 +161,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719994518, "lastModified": 1719877454,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720042825, "lastModified": 1719827385,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -486,11 +486,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1720296628, "lastModified": 1719923896,
"narHash": "sha256-v42XPTrP7oJSAFhn9zJVvPc1DbPVW/Id6J8/eKCY9oo=", "narHash": "sha256-/hfE2x9NbT13d53o9uq6MuMipV19pJUQzpsZIhlvsiM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "a53fa82a0564d3fe94a89c1dd53b703c3c67d1cd", "rev": "d384cf656cb1b21d90eee1b007a6ade6f90768f5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -14,7 +14,6 @@
./telescope.nix ./telescope.nix
./treesitter.nix ./treesitter.nix
./alpha.nix ./alpha.nix
./fold.nix
]; ];
# Load Plugins that aren't provided as modules by nixvim # Load Plugins that aren't provided as modules by nixvim
@ -44,6 +43,11 @@
-- buffer_manager.nvim -- buffer_manager.nvim
local opts = {noremap = true} local opts = {noremap = true}
require("precognition").setup(
{
}
)
require("buffer_manager").setup( require("buffer_manager").setup(
{ {
line_keys = "1234567890", line_keys = "1234567890",

View File

@ -1,31 +0,0 @@
{
programs.nixvim.plugins.nvim-ufo = {
enable = true;
};
programs.nixvim.extraConfigLua = ''
-- default fold options
vim.o.foldcolumn = '1'
vim.o.foldlevel = 99
vim.o.foldlevelstart = 99
vim.o.foldenable = true
-- nvim_ufo options
vim.keymap.set('n', 'zR', require('ufo').openAllFolds, { desc = "Open all folds" })
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds, { desc = "Close all folds" })
vim.keymap.set('n', 'zK', function()
local winid = require("ufo").peekFoldedLinesUnderCursor()
if not winid then
vim.lsp.buf.hover()
end
end , { desc = "Peed fold" })
require("ufo").setup({
provider_selector = function(bufnr, filetype, buftype)
return { 'lsp', 'indent' }
end
})
'';
}

View File

@ -1,57 +1,51 @@
{ {
programs.nixvim.plugins = { programs.nixvim.plugins.lsp = {
lsp = { enable = true;
enable = true; servers = {
servers = { lua-ls = { enable = true; };
lua-ls = { enable = true; }; nixd = { enable = true; };
nixd = { enable = true; }; bashls = { enable = true; };
bashls = { enable = true; }; pyright = { enable = true; };
pyright = { enable = true; }; html = { enable = true; };
html = { enable = true; }; yamlls = { enable = true; };
yamlls = { enable = true; }; marksman = { enable = true; };
marksman = { enable = true; }; #sqls = {enable = true;};
#sqls = {enable = true;}; };
}; keymaps = {
keymaps = { lspBuf = {
lspBuf = { gd = {
gd = { action = "definition";
action = "definition"; desc = "Goto Definition";
desc = "Goto Definition"; };
}; gr = {
gr = { action = "references";
action = "references"; desc = "Goto References";
desc = "Goto References"; };
}; gD = {
gD = { action = "declaration";
action = "declaration"; desc = "Goto Declaration";
desc = "Goto Declaration"; };
}; gI = {
gI = { action = "implementation";
action = "implementation"; desc = "Goto Implementation";
desc = "Goto Implementation"; };
}; gT = {
gT = { action = "type_definition";
action = "type_definition"; desc = "Type Definition";
desc = "Type Definition"; };
}; K = {
K = { action = "hover";
action = "hover"; desc = "Hover";
desc = "Hover"; };
}; "<leader>cw" = {
"<leader>cw" = { action = "workspace_symbol";
action = "workspace_symbol"; desc = "Workspace Symbol";
desc = "Workspace Symbol"; };
}; "<leader>cr" = {
"<leader>cr" = { action = "rename";
action = "rename"; desc = "Rename";
desc = "Rename";
};
}; };
}; };
}; };
# TODO enable otter.nvim when merged into nixvim stable
# otter = {
# enable = true;
# };
}; };
} }