Skip to content

Commit f111c38

Browse files
authored
Merge branch 'master' into chore-deprecated-api-and-warnings
2 parents 99c23c3 + 5b9b524 commit f111c38

File tree

8 files changed

+962
-937
lines changed

8 files changed

+962
-937
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ body:
88
Before reporting:
99
* search [existing issues](https://github.com/nvim-tree/nvim-web-devicons/issues)
1010
* ensure that nvim-web-devicons is updated to the latest version
11+
* please ensure that you are running the latest version of a [Nerd Font](https://www.nerdfonts.com/)
12+
* windows users please see [Windows and WSL not rendering icons properly on some terminals](https://github.com/nvim-tree/nvim-web-devicons?tab=readme-ov-file#windows-and-wsl-not-rendering-icons-properly-on-some-terminals)
1113
1214
Please submit a Pull Request to add an icon, see [CONTRIBUTING.md](https://github.com/nvim-tree/nvim-web-devicons/blob/master/CONTRIBUTING.md)
1315
- type: textarea

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/johnnymorganz/stylua
3-
rev: v2.0.2
3+
rev: v2.1.0
44
hooks:
55
- id: stylua-github
66
fail_fast: true

lua/nvim-web-devicons.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ local function get_highlight_ctermfg(icon_data)
200200
end
201201

202202
local function apply_user_icons()
203+
if type(user_icons) ~= "table" then
204+
return
205+
end
206+
203207
if user_icons.override and user_icons.override.default_icon then
204208
default_icon = user_icons.override.default_icon
205209
end

lua/nvim-web-devicons/default/icons_by_file_extension.lua

Lines changed: 473 additions & 465 deletions
Large diffs are not rendered by default.

lua/nvim-web-devicons/default/icons_by_filename.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ return {
9797
["fp-info-cache"] = { icon = "", color = "#FFFFFF", cterm_color = "231", name = "KiCadCache" },
9898
["fp-lib-table"] = { icon = "", color = "#FFFFFF", cterm_color = "231", name = "KiCadFootprintTable" },
9999
["gnumakefile"] = { icon = "", color = "#6D8086", cterm_color = "66", name = "Makefile" },
100-
["go.mod"] = { icon = "", color = "#519ABA", cterm_color = "74", name = "GoMod" },
101-
["go.sum"] = { icon = "", color = "#519ABA", cterm_color = "74", name = "GoSum" },
102-
["go.work"] = { icon = "", color = "#519ABA", cterm_color = "74", name = "GoWork" },
100+
["go.mod"] = { icon = "", color = "#00ADD8", cterm_color = "38", name = "GoMod" },
101+
["go.sum"] = { icon = "", color = "#00ADD8", cterm_color = "38", name = "GoSum" },
102+
["go.work"] = { icon = "", color = "#00ADD8", cterm_color = "38", name = "GoWork" },
103103
["gradle-wrapper.properties"] = { icon = "", color = "#005F87", cterm_color = "24", name = "GradleWrapperProperties" },
104104
["gradle.properties"] = { icon = "", color = "#005F87", cterm_color = "24", name = "GradleProperties" },
105105
["gradlew"] = { icon = "", color = "#005F87", cterm_color = "24", name = "GradleWrapperScript" },
@@ -115,6 +115,7 @@ return {
115115
["gulpfile.ts"] = { icon = "", color = "#CC3E44", cterm_color = "167", name = "Gulpfile" },
116116
["hypridle.conf"] = { icon = "", color = "#00AAAE", cterm_color = "37", name = "Hypridle" },
117117
["hyprland.conf"] = { icon = "", color = "#00AAAE", cterm_color = "37", name = "Hyprland" },
118+
["hyprlandd.conf"] = { icon = "", color = "#00AAAE", cterm_color = "37", name = "Hyprlandd" },
118119
["hyprlock.conf"] = { icon = "", color = "#00AAAE", cterm_color = "37", name = "Hyprlock" },
119120
["hyprpaper.conf"] = { icon = "", color = "#00AAAE", cterm_color = "37", name = "Hyprpaper" },
120121
["i18n.config.js"] = { icon = "󰗊", color = "#7986CB", cterm_color = "104", name = "I18nConfig" },

lua/nvim-web-devicons/filetypes.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---Maps filetypes to icon names
22
---@type table<string, iconName>
33
return {
4+
["ada"] = "ada",
45
["apl"] = "apl",
56
["asm"] = "asm",
67
["astro"] = "astro",

lua/nvim-web-devicons/light/icons_by_file_extension.lua

Lines changed: 473 additions & 465 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lua/nvim-web-devicons/light/icons_by_filename.lua

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)