sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge master

This commit is contained in:
Sam 2024-07-07 16:48:11 +01:00
parent 539ac37b8a efb6128704
commit fb7cf9e280
3 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

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

6
home/common/core/nixvim/plugins/fold.nix
View File

@ -4,16 +4,16 @@
}; };
programs.nixvim.extraConfigLua = '' programs.nixvim.extraConfigLua = ''
# default fold options -- default fold options
vim.o.foldcolumn = '1' vim.o.foldcolumn = '1'
vim.o.foldlevel = 99 vim.o.foldlevel = 99
vim.o.foldlevelstart = 99 vim.o.foldlevelstart = 99
vim.o.foldenable = true vim.o.foldenable = true
# nvim_ufo options -- nvim_ufo options
vim.keymap.set('n', 'zR', require('ufo').openAllFolds, { desc = "Open all folds" }) 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', 'zM', require('ufo').closeAllFolds, { desc = "Close all folds" })
vim.keymap.set('n', 'zM', function() vim.keymap.set('n', 'zK', function()
local winid = require("ufo").peekFoldedLinesUnderCursor() local winid = require("ufo").peekFoldedLinesUnderCursor()
if not winid then if not winid then
vim.lsp.buf.hover() vim.lsp.buf.hover()

96
home/common/core/nixvim/plugins/lsp.nix
View File

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