Add couple plugins.

Comment.nvim, ts-context-commentring, lspkind, indent-blankline and added cmp back with new settings api.

flake.lock

@@ -148,11 +148,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1710146030,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703887061,
+        "lastModified": 1709087332,
-        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,10 @@
         ]
       },
       "locked": {
+        "dirtyRev": "0179875f61f71332bfaa52ed391703bdd2410e4c-dirty",
+        "dirtyShortRev": "0179875-dirty",
         "lastModified": 1710021334,
-        "narHash": "sha256-YxUEahj93lyZiRJkQK4dn7ikrnq/FsG06QQf5cgQX94=",
+        "narHash": "sha256-rT0HoGQ3Ao1fGmpbxiuCI7HrEcO8gruVXaVdrpSyp/k=",
-        "ref": "refs/heads/main",
-        "rev": "0179875f61f71332bfaa52ed391703bdd2410e4c",
-        "revCount": 5,
         "type": "git",
         "url": "file:///home/crony/Documents/develop/hb-downloader"
       },
@@ -231,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710532761,
+        "lastModified": 1710820906,
-        "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
+        "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
+        "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
         "type": "github"
       },
       "original": {
@@ -252,11 +251,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710281778,
+        "lastModified": 1710714957,
-        "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=",
+        "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "49a266d2ca59df8a03249550e73a54626181b65d",
+        "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989",
         "type": "github"
       },
       "original": {
@@ -273,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710281379,
+        "lastModified": 1710717205,
-        "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=",
+        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670",
+        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
         "type": "github"
       },
       "original": {
@@ -288,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1710451336,
+        "lastModified": 1710631334,
-        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
+        "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
+        "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
         "type": "github"
       },
       "original": {
@@ -304,11 +303,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1704874635,
+        "lastModified": 1710695816,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
         "type": "github"
       },
       "original": {
@@ -320,11 +319,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1704842529,
+        "lastModified": 1710765496,
-        "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
+        "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
+        "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7",
         "type": "github"
       },
       "original": {
@@ -347,11 +346,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1710491356,
+        "lastModified": 1710844277,
-        "narHash": "sha256-DeMiM/lgf8HqeAcDU26EeMaoU0phB8mY2RVYBtpvZN0=",
+        "narHash": "sha256-fywETkJWkJkvWxj/Oy8elbKQML8wtKtSVN0lDRV+pFA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "9f7c78852f37126244b43e71e5158cdc3d70ad0a",
+        "rev": "50038f6c8f1460784320a2f022750c1d39781ef4",
         "type": "github"
       },
       "original": {
@@ -397,11 +396,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1708018599,
+        "lastModified": 1710843117,
-        "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
+        "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
+        "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347",
         "type": "github"
       },
       "original": {

home-manager/modules/nvim.nix

@@ -62,6 +62,59 @@
     '';
     extraPackages = with pkgs; [ stylua isort black nixfmt jq shfmt ];
     plugins = {
+      comment-nvim.enable = true;
+
+      ts-context-commentstring.enable = true;
+
+      todo-comments.enable = true;
+
+      lspkind = {
+        enable = true;
+        cmp.enable = true;
+      };
+
+      indent-blankline = {
+        enable = true;
+        scope.enabled = false;
+      };
+
+      cmp = {
+        enable = true;
+        settings = {
+          mapping = {
+            "<C-l>" = "cmp.mapping.confirm({ select = true })";
+            "<C-j>" = ''
+              function(fallback)
+                  if cmp.visible then
+                    cmp.select_next_item()
+                  else
+                    fallback()
+                  end
+              end
+            '';
+            "<C-k>" = ''
+              function(fallback)
+                  if cmp.visible then
+                    cmp.select_next_item()
+                  else
+                    fallback()
+                  end
+              end
+            '';
+            "<C-Space>" = "cmp.mapping.complete()";
+            "<C-e>" = "cmp.mapping.abort()";
+            "<C-u>" = "cmp.mapping.scroll_docs(-4)";
+            "<C-d>" = "cmp.mapping.scroll_docs(4)";
+          };
+          snippet.expand = ''
+            function(args)
+                require('snippy').expand_snippet(args.body)
+            end
+          '';
+          sources =
+            [ { name = "nvim_lsp"; } { name = "path"; } { name = "snippy"; } ];
+        };
+      };
       conform-nvim = {
         enable = true;
         formattersByFt = {
@@ -130,7 +183,6 @@
         enable = true;
         modules = {
           statusline = { set_vim_settings = false; };
-          comment = { };
           notify = { };
         };
       };