diff --git a/flake.lock b/flake.lock index 9f30b93..aad10b5 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1719827385, - "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719923896, - "narHash": "sha256-/hfE2x9NbT13d53o9uq6MuMipV19pJUQzpsZIhlvsiM=", + "lastModified": 1720296628, + "narHash": "sha256-v42XPTrP7oJSAFhn9zJVvPc1DbPVW/Id6J8/eKCY9oo=", "owner": "nix-community", "repo": "nixvim", - "rev": "d384cf656cb1b21d90eee1b007a6ade6f90768f5", + "rev": "a53fa82a0564d3fe94a89c1dd53b703c3c67d1cd", "type": "github" }, "original": { diff --git a/home/common/core/nixvim/plugins/fold.nix b/home/common/core/nixvim/plugins/fold.nix index f5631d0..8885f4c 100644 --- a/home/common/core/nixvim/plugins/fold.nix +++ b/home/common/core/nixvim/plugins/fold.nix @@ -4,16 +4,16 @@ }; programs.nixvim.extraConfigLua = '' - # default fold options + -- default fold options vim.o.foldcolumn = '1' vim.o.foldlevel = 99 vim.o.foldlevelstart = 99 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', '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() if not winid then vim.lsp.buf.hover() diff --git a/home/common/core/nixvim/plugins/lsp.nix b/home/common/core/nixvim/plugins/lsp.nix index 15d2ea7..eb224c7 100644 --- a/home/common/core/nixvim/plugins/lsp.nix +++ b/home/common/core/nixvim/plugins/lsp.nix @@ -1,51 +1,57 @@ { - programs.nixvim.plugins.lsp = { - enable = true; - servers = { - lua-ls = { enable = true; }; - nixd = { enable = true; }; - bashls = { enable = true; }; - pyright = { enable = true; }; - html = { enable = true; }; - yamlls = { enable = true; }; - marksman = { enable = true; }; - #sqls = {enable = true;}; - }; - keymaps = { - lspBuf = { - gd = { - action = "definition"; - desc = "Goto Definition"; - }; - gr = { - action = "references"; - desc = "Goto References"; - }; - gD = { - action = "declaration"; - desc = "Goto Declaration"; - }; - gI = { - action = "implementation"; - desc = "Goto Implementation"; - }; - gT = { - action = "type_definition"; - desc = "Type Definition"; - }; - K = { - action = "hover"; - desc = "Hover"; - }; - "cw" = { - action = "workspace_symbol"; - desc = "Workspace Symbol"; - }; - "cr" = { - action = "rename"; - desc = "Rename"; + programs.nixvim.plugins = { + lsp = { + enable = true; + servers = { + lua-ls = { enable = true; }; + nixd = { enable = true; }; + bashls = { enable = true; }; + pyright = { enable = true; }; + html = { enable = true; }; + yamlls = { enable = true; }; + marksman = { enable = true; }; + #sqls = {enable = true;}; + }; + keymaps = { + lspBuf = { + gd = { + action = "definition"; + desc = "Goto Definition"; + }; + gr = { + action = "references"; + desc = "Goto References"; + }; + gD = { + action = "declaration"; + desc = "Goto Declaration"; + }; + gI = { + action = "implementation"; + desc = "Goto Implementation"; + }; + gT = { + action = "type_definition"; + desc = "Type Definition"; + }; + K = { + action = "hover"; + desc = "Hover"; + }; + "cw" = { + action = "workspace_symbol"; + desc = "Workspace Symbol"; + }; + "cr" = { + action = "rename"; + desc = "Rename"; + }; }; }; }; + # TODO enable otter.nvim when merged into nixvim stable + # otter = { + # enable = true; + # }; }; }