feat: improved smartcolumn freeform

extra.nix

@@ -185,6 +185,7 @@ inputs: let
             nix = 110;
             ruby = 120;
             java = 130;
+            go = [90 130];
           };
         };
         colorizer.enable = true;

lib/lua.nix

@@ -12,21 +12,29 @@
     then "nil"
     else "'${value}'";
 
-  # Helper function to convert an attribute name to a Lua table key
+  expToLua = exp:
-  attrToKey = name: name;
+    if builtins.isList exp
+    then listToLuaTable exp
+    else if builtins.isAttrs exp
+    then attrsetToLuaTable exp
+    else ("\"" + builtins.toJSON exp + "\"");
+
+  listToLuaTable = list:
+    "{ " + (builtins.concatStringsSep ", " (map expToLua list)) + " }";
 
-  # Function to convert a Nix attrset to a Lua table
   attrsetToLuaTable = attrset:
     "{ "
     + (
       builtins.concatStringsSep ", "
-      (builtins.attrValues (
+      (
-        builtins.mapAttrs (
+        lib.mapAttrsToList (
           name: value:
-            attrToKey name + " = " + ("\"" + builtins.toJSON value + "\"")
+            name
+            + " = "
+            + (expToLua value)
         )
         attrset
-      ))
+      )
     )
     + " }";
 }

modules/ui/smartcolumn/config.nix

@@ -15,11 +15,11 @@ in {
 
     vim.luaConfigRC.smartcolumn = nvim.dag.entryAnywhere ''
       require("smartcolumn").setup({
-         colorcolumn = "${toString cfg.showColumnAt}",
+        colorcolumn = "${toString cfg.showColumnAt}",
-         -- { "help", "text", "markdown", "NvimTree", "alpha"},
+        -- { "help", "text", "markdown", "NvimTree", "alpha"},
-         disabled_filetypes = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.disabledFiletypes)} },
+        disabled_filetypes = { ${concatStringsSep ", " (map (x: "\"" + x + "\"") cfg.disabledFiletypes)} },
-         custom_colorcolumn = ${nvim.lua.attrsetToLuaTable cfg.columnAt.languages},
+        custom_colorcolumn = ${nvim.lua.attrsetToLuaTable cfg.columnAt.languages},
-         scope = "file",
+        scope = "file",
       })
     '';
   };

modules/ui/smartcolumn/smartcolumn.nix

@@ -17,13 +17,21 @@ with builtins; {
     };
 
     columnAt = {
-      # TODO: the current implementation only allows for options such as { ruby = "120", java = "120" }
-      # whereas the lua config would allow { ruby = "120", java = { "180", "200"} }, this needs to be fixed in the custom lib
       languages = lib.mkOption {
         description = "The position at which smart column should be displayed for each individual buffer type";
         type = lib.types.submodule {
-          freeformType = with lib.types; attrsOf int;
+          freeformType = with lib.types; attrsOf (either int (listOf int));
         };
+
+        example = lib.literalExpression ''
+          vim.ui.smartcolumn.columnAt.languages = {
+            nix = 110;
+            ruby = 120;
+            java = 130;
+            go = [90 130];
+          };
+
+        '';
       };
     };
   };