From 31b9afbc1931f1cbcd7d13f0408e1c94dc182c9c Mon Sep 17 00:00:00 2001
From: Fred Drake <fred.drake@gmail.com>
Date: Wed, 12 Feb 2025 22:14:23 -0500
Subject: [PATCH] Improved completion look and feel

---
 config/language.nix | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/config/language.nix b/config/language.nix
index 4ef6715..428e4ca 100644
--- a/config/language.nix
+++ b/config/language.nix
@@ -1,5 +1,9 @@
 let
-  selectOpts = "{behavior = cmp.SelectBehavior.Select}";
+  selectOpts = ''
+    {
+      behavior = cmp.SelectBehavior.Insert
+    }
+  '';
 in
   {pkgs, ...}: {
     plugins = {
@@ -22,28 +26,17 @@ in
               keywordLength = 3;
             }
             {name = "supermaven";}
+            {name = "luasnip";}
           ];
 
           snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
           formatting = {
             fields = [
-              "menu"
               "abbr"
               "kind"
+              "menu"
             ];
-            format = ''
-              function(entry, item)
-                local menu_icon = {
-                  nvim_lsp = '[LSP]',
-                  luasnip = '[SNIP]',
-                  buffer = '[BUF]',
-                  path = '[PATH]',
-                }
-
-                item.menu = menu_icon[entry.source.name]
-                return item
-              end
-            '';
+            # format = lspkindFormat;
           };
 
           mapping = {
@@ -136,6 +129,9 @@ in
         };
       };
       cmp-nvim-lsp.enable = true;
+      lspkind.enable = true;
+      lspkind.cmp.enable = true;
+      luasnip.enable = true;
       cmp-buffer.enable = true;
       cmp-path.enable = true;
       cmp-treesitter.enable = true;
@@ -148,12 +144,7 @@ in
           just.enable = true;
           opentofu_fmt.enable = true;
           prettier.enable = true;
-          # rubyfmt is broken on darwin-based systems
-          rubyfmt.enable = (
-            pkgs.stdenv.hostPlatform.system
-            != "x86_64-darwin"
-            && pkgs.stdenv.hostPlatform.system != "aarch64-darwin"
-          );
+          rubocop.enable = true;
           sqlformat.enable = true;
           stylua.enable = true;
           yamlfmt.enable = true;
@@ -181,7 +172,7 @@ in
             lua = ["stylua"];
             markdown = ["prettier"];
             nix = ["alejandra"];
-            ruby = ["rubyfmt"];
+            ruby = ["rubocop"];
             terraform = ["tofu_fmt"];
             tf = ["tofu_fmt"];
             yaml = ["yamlfmt"];