From 46cc0a4fde2a064a666c668ab356acd024c1019c Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 16 Oct 2024 02:40:54 +0530 Subject: [PATCH] chore(update): Update to the lastest versions of nixvim and nixpkgs --- flake.lock | 44 ++++++++++++++++++++++---------------------- neovim/nvim.nix | 34 +++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 687c9be5..cc2d4a3e 100644 --- a/flake.lock +++ b/flake.lock @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -1131,11 +1131,11 @@ ] }, "locked": { - "lastModified": 1727805723, - "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -1339,11 +1339,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -1856,7 +1856,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-A7z0AT1zvuBU7GGe/dwiZ3Ffge6LltZRoWz8P31AznI=", + "narHash": "sha256-a4+2gPdX4ziDuk/hBfpILy9/MyXh36ghysMdjjmmblY=", "path": "./neovim", "type": "path" }, @@ -1931,11 +1931,11 @@ ] }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1728385805, + "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", "type": "github" }, "original": { @@ -2304,11 +2304,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1727871072, - "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", + "lastModified": 1728485062, + "narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", + "rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135", "type": "github" }, "original": { @@ -2523,11 +2523,11 @@ ] }, "locked": { - "lastModified": 1727599661, - "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "lastModified": 1728423244, + "narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=", "owner": "NuschtOS", "repo": "search", - "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "rev": "f276cc3b391493ba3a8b30170776860f9520b7fa", "type": "github" }, "original": { @@ -3209,11 +3209,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index ebe2c2d2..8d8e33d4 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -158,6 +158,7 @@ in rec { rest = { enable = true; enableTelescope = true; + settings.response.hooks.format = true; }; comment = { @@ -258,16 +259,18 @@ in rec { nvim-ufo = { enable = true; - closeFoldKinds = null; - providerSelector = - /* - lua - */ - '' - function(bufnr, filetype, buftype) - return {'treesitter', 'indent'} - end - ''; + settings = { + close_fold_kinds = null; + provider_selector = + /* + lua + */ + '' + function(bufnr, filetype, buftype) + return {'treesitter', 'indent'} + end + ''; + }; }; rustaceanvim = { enable = false; @@ -335,7 +338,7 @@ in rec { servers = { taplo.enable = true; gopls.enable = true; - nil-ls = { + nil_ls = { enable = true; settings.formatting.command = [ "${pkgs.alejandra}/bin/alejandra" @@ -343,17 +346,18 @@ in rec { # nix.flake.autoArchive = true; }; marksman.enable = true; + neocmake.enable = true; nushell.enable = true; clangd.enable = true; - lua-ls.enable = true; + lua_ls.enable = true; jsonls.enable = true; html.enable = true; htmx.enable = true; elixirls.enable = true; - ast-grep.enable = true; + ast_grep.enable = true; sqls.enable = true; pyright.enable = true; - rust-analyzer = { + rust_analyzer = { enable = true; package = null; installCargo = false; @@ -754,6 +758,6 @@ in rec { pkgs.tree-sitter-grammars.tree-sitter-norg-meta ]; extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim]; - extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek]; + extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl]; }; }