Merge branch 'NikolaM-Dev-feature-custom-icons'

.github/generate.py

@@ -100,7 +100,11 @@ COL_DEFS = [
         "*",
         False,
         "An icon for the entry's type (requires nvim-web-devicons)",
-        HL + [],
+        HL
+        + [
+            LuaParam("default_file", "string", "Fallback icon for files when nvim-web-devicons returns nil"),
+            LuaParam("directory", "string", "Icon for directories"),
+        ],
     ),
     ColumnDef("size", "files, ssh", False, "The size of the file", HL + []),
     ColumnDef(

doc/oil.txt

@@ -232,8 +232,11 @@ icon                                                                 *column-ico
     An icon for the entry's type (requires nvim-web-devicons)
 
     Parameters:
-      {highlight} `string|fun(value: string): string` Highlight group, or
+      {highlight}    `string|fun(value: string): string` Highlight group, or
-                  function that returns a highlight group
+                     function that returns a highlight group
+      {default_file} `string` Fallback icon for files when nvim-web-devicons
+                     returns nil
+      {directory}    `string` Icon for directories
 
 size                                                                 *column-size*
     Adapters: files, ssh

lua/oil/columns.lua

@@ -205,12 +205,13 @@ if has_devicons then
         end
       end
       if type == "directory" then
-        return { " ", "OilDir" }
+        local icon = conf and conf.directory or " "
+        return { icon, "OilDir" }
       else
         local icon
         local hl
         icon, hl = devicons.get_icon(name)
-        icon = icon or ""
+        icon = icon or (conf and conf.default_file or "")
         return { icon .. " ", hl }
       end
     end,