From 0365f6f7cb427b9b2d5d85a4f12f2bb8c4dc8f09 Mon Sep 17 00:00:00 2001 From: harry123 Date: Thu, 10 Jul 2025 10:28:32 +0200 Subject: [PATCH] added lsp support --- config/plugins.nix | 69 ++++++++++++++++++++++++++++++++++++++++------ flake.lock | 42 ++++++++++++++-------------- 2 files changed, 81 insertions(+), 30 deletions(-) diff --git a/config/plugins.nix b/config/plugins.nix index 652c653..12e65ff 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -4,13 +4,11 @@ pkgs, ... }: - { plugins = { lsp = { enable = true; servers = { - basedpyright.enable = true; asm_lsp.enable = true; gopls.enable = true; @@ -66,9 +64,56 @@ enable = true; }; - cmp = { + blink-ripgrep.enable = true; + + blink-cmp = { enable = true; - autoEnableSources = true; + setupLspCapabilities = true; + settings = { + + keymap = { + "" = [ + "accept" + "fallback" + ]; + "" = [ + "select_next" + "snippet_forward" + "fallback" + ]; + "" = [ + "select_prev" + "snippet_backward" + "fallback" + ]; + }; + + signature = { + enabled = true; + window = { + border = "rounded"; + }; + }; + + sources = { + default = [ + "buffer" + "lsp" + "path" + "snippets" + "ripgrep" + ]; + providers = { + lsp.score_offset = 4; + ripgrep = { + name = "ripgrep"; + module = "blink-ripgrep"; + score_offset = 1; + }; + }; + }; + + }; }; barbar.enable = true; @@ -96,10 +141,6 @@ enable = true; }; - nvim-autopairs = { - enable = true; - }; - cord = { enable = true; }; @@ -107,7 +148,10 @@ chadtree = { enable = true; view.openDirection = "right"; - keymap.openFileFolder.collapse = [ "l" ]; + keymap.openFileFolder.primary = [ + "l" + "" + ]; }; fzf-lua = { @@ -143,6 +187,8 @@ lazygit.enable = true; mini.enable = true; + mini-pairs.enable = true; + mini-starter.enable = true; dap = { enable = true; @@ -178,5 +224,10 @@ zen-mode = { enable = true; }; + + indent-blankline.enable = true; + neorg = { + enable = true; + }; }; } diff --git a/flake.lock b/flake.lock index cf11803..b83398d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748792178, - "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=", + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e", + "rev": "9b008d60392981ad674e04016d25619281550a9d", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748406211, - "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", + "lastModified": 1751786137, + "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", + "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748877332, - "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", + "lastModified": 1752099138, + "narHash": "sha256-riX+IkcFhurR1M1vMEp2cdzraxsZEZl+XbpFWcgz3lU=", "owner": "nix-community", "repo": "nixvim", - "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", + "rev": "2e24f8e62bc5da7e1ce81e2f2ff7d9e1f51350b7", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": {