raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-12-19 09:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

dev use submodules for diagnostics

Browse source
This commit is contained in:
NotAShelf 2023-07-30 14:46:59 +03:00
parent b90ec97fed
commit 500c9b67dd
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 61 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/filetree/nvimtree/config.nix
View file

@ -74,7 +74,7 @@ in {
disable_netrw = ${boolToString cfg.disableNetrw}, disable_netrw = ${boolToString cfg.disableNetrw},
hijack_netrw = ${boolToString cfg.hijackNetrw}, hijack_netrw = ${boolToString cfg.hijackNetrw},
auto_reload_on_write = ${boolToString cfg.autoreloadOnWrite}, auto_reload_on_write = ${boolToString cfg.autoreloadOnWrite},
sort = { sort = {
sorter = "${cfg.sort.sorter}", sorter = "${cfg.sort.sorter}",
folders_first = ${boolToString cfg.sort.foldersFirst}, folders_first = ${boolToString cfg.sort.foldersFirst},
@ -87,7 +87,7 @@ in {
sync_root_with_cwd = ${boolToString cfg.syncRootWithCwd}, sync_root_with_cwd = ${boolToString cfg.syncRootWithCwd},
reload_on_bufenter = ${boolToString cfg.reloadOnBufEnter}, reload_on_bufenter = ${boolToString cfg.reloadOnBufEnter},
respect_buf_cwd = ${boolToString cfg.respectBufCwd}, respect_buf_cwd = ${boolToString cfg.respectBufCwd},
hijack_directories = { hijack_directories = {
enable = ${boolToString cfg.hijackDirectories.enable}, enable = ${boolToString cfg.hijackDirectories.enable},
auto_open = ${boolToString cfg.hijackDirectories.autoOpen}, auto_open = ${boolToString cfg.hijackDirectories.autoOpen},
@ -164,7 +164,7 @@ in {
}, },
}, },
}, },
renderer = { renderer = {
add_trailing = ${boolToString cfg.renderer.addTrailing}, add_trailing = ${boolToString cfg.renderer.addTrailing},
group_empty = ${boolToString cfg.renderer.groupEmpty}, group_empty = ${boolToString cfg.renderer.groupEmpty},
@ -179,7 +179,7 @@ in {
inline_arrows = ${boolToString cfg.renderer.indentMarkers.inlineArrows}, inline_arrows = ${boolToString cfg.renderer.indentMarkers.inlineArrows},
icons = ${nvim.lua.expToLua cfg.renderer.indentMarkers.icons}, icons = ${nvim.lua.expToLua cfg.renderer.indentMarkers.icons},
}, },
special_files = ${nvim.lua.listToLuaTable cfg.renderer.specialFiles}, special_files = ${nvim.lua.listToLuaTable cfg.renderer.specialFiles},
symlink_destination = ${boolToString cfg.renderer.symlinkDestination}, symlink_destination = ${boolToString cfg.renderer.symlinkDestination},
@ -189,7 +189,7 @@ in {
modified_placement = "${cfg.renderer.icons.modifiedPlacement}", modified_placement = "${cfg.renderer.icons.modifiedPlacement}",
padding = "${cfg.renderer.icons.padding}", padding = "${cfg.renderer.icons.padding}",
symlink_arrow = "${cfg.renderer.icons.symlinkArrow}", symlink_arrow = "${cfg.renderer.icons.symlinkArrow}",
show = { show = {
git = ${boolToString cfg.renderer.icons.show.git}, git = ${boolToString cfg.renderer.icons.show.git},
folder = ${boolToString cfg.renderer.icons.show.folder}, folder = ${boolToString cfg.renderer.icons.show.folder},
@ -197,12 +197,12 @@ in {
file = ${boolToString cfg.renderer.icons.show.file}, file = ${boolToString cfg.renderer.icons.show.file},
modified = ${boolToString cfg.renderer.icons.show.modified}, modified = ${boolToString cfg.renderer.icons.show.modified},
}, },
glyphs = { glyphs = {
default = "${cfg.renderer.icons.glyphs.default}", default = "${cfg.renderer.icons.glyphs.default}",
symlink = "${cfg.renderer.icons.glyphs.symlink}", symlink = "${cfg.renderer.icons.glyphs.symlink}",
modified = "${cfg.renderer.icons.glyphs.modified}", modified = "${cfg.renderer.icons.glyphs.modified}",
folder = { folder = {
default = "${cfg.renderer.icons.glyphs.folder.default}", default = "${cfg.renderer.icons.glyphs.folder.default}",
open = "${cfg.renderer.icons.glyphs.folder.open}", open = "${cfg.renderer.icons.glyphs.folder.open}",
@ -226,7 +226,7 @@ in {
}, },
}, },
}, },
filters = { filters = {
git_ignored = ${boolToString cfg.filters.gitIgnored}, git_ignored = ${boolToString cfg.filters.gitIgnored},
dotfiles = ${boolToString cfg.filters.dotfiles}, dotfiles = ${boolToString cfg.filters.dotfiles},
@ -234,11 +234,11 @@ in {
no_buffer = ${boolToString cfg.filters.noBuffer}, no_buffer = ${boolToString cfg.filters.noBuffer},
exclude = ${nvim.lua.listToLuaTable cfg.filters.exclude}, exclude = ${nvim.lua.listToLuaTable cfg.filters.exclude},
}, },
trash = { trash = {
cmd = "${cfg.trash.cmd}", cmd = "${cfg.trash.cmd}",
}, },
actions = { actions = {
use_system_clipboard = ${boolToString cfg.actions.useSystemClipboard}, use_system_clipboard = ${boolToString cfg.actions.useSystemClipboard},
change_dir = { change_dir = {
@ -251,11 +251,11 @@ in {
max_folder_discovery = ${toString cfg.actions.expandAll.maxFolderDiscovery}, max_folder_discovery = ${toString cfg.actions.expandAll.maxFolderDiscovery},
exclude = ${nvim.lua.listToLuaTable cfg.actions.expandAll.exclude}, exclude = ${nvim.lua.listToLuaTable cfg.actions.expandAll.exclude},
}, },
file_popup = { file_popup = {
open_win_config = ${nvim.lua.expToLua cfg.actions.filePopup.openWinConfig}, open_win_config = ${nvim.lua.expToLua cfg.actions.filePopup.openWinConfig},
}, },
open_file = { open_file = {
quit_on_open = ${boolToString cfg.actions.openFile.quitOnOpen}, quit_on_open = ${boolToString cfg.actions.openFile.quitOnOpen},
eject = ${boolToString cfg.actions.openFile.eject}, eject = ${boolToString cfg.actions.openFile.eject},
@ -270,17 +270,17 @@ in {
}, },
}, },
}, },
remove_file = { remove_file = {
close_window = ${boolToString cfg.actions.removeFile.closeWindow}, close_window = ${boolToString cfg.actions.removeFile.closeWindow},
}, },
}, },
live_filter = { live_filter = {
prefix = "${cfg.liveFilter.prefix}", prefix = "${cfg.liveFilter.prefix}",
always_show_folders = ${boolToString cfg.liveFilter.alwaysShowFolders}, always_show_folders = ${boolToString cfg.liveFilter.alwaysShowFolders},
}, },
tab = { tab = {
sync = { sync = {
open = ${boolToString cfg.tab.sync.open}, open = ${boolToString cfg.tab.sync.open},

80
modules/filetree/nvimtree/nvimtree.nix
View file

@ -199,18 +199,6 @@ with builtins; {
debounceDelay = 50; debounceDelay = 50;
showOnDirs = false; showOnDirs = false;
showOnOpenDirs = true; showOnOpenDirs = true;
icons = {
hint = "";
info = "";
warning = "";
error = "";
};
severity = {
min = "HINT";
max = "ERROR";
};
}; };
type = types.submodule { type = types.submodule {
@ -232,34 +220,58 @@ with builtins; {
type = types.bool; type = types.bool;
}; };
icons = { icons = mkOption {
hint = mkOption { description = "Icons for diagnostic severity.";
description = "Icon used for `hint` diagnostic.";
type = types.str; default = {
hint = "";
info = "";
warning = "";
error = "";
}; };
info = mkOption {
description = "Icon used for `info` diagnostic."; type = types.submodule {
type = types.str; options = {
}; hint = mkOption {
warning = mkOption { description = "Icon used for `hint` diagnostic.";
description = "Icon used for `warning` diagnostic."; type = types.str;
type = types.str; };
}; info = mkOption {
error = mkOption { description = "Icon used for `info` diagnostic.";
description = "Icon used for `error` diagnostic."; type = types.str;
type = types.str; };
warning = mkOption {
description = "Icon used for `warning` diagnostic.";
type = types.str;
};
error = mkOption {
description = "Icon used for `error` diagnostic.";
type = types.str;
};
};
}; };
}; };
severity = { severity = mkOption {
min = mkOption { description = "Severity for which the diagnostics will be displayed";
description = "Minimum severity.";
type = types.enum ["HINT" "INFO" "WARNING" "ERROR"]; default = {
min = "HINT";
max = "ERROR";
}; };
max = mkOption { type = types.submodule {
description = "Maximum severity."; options = {
type = types.enum ["HINT" "INFO" "WARNING" "ERROR"]; min = mkOption {
description = "Minimum severity.";
type = types.enum ["HINT" "INFO" "WARNING" "ERROR"];
};
max = mkOption {
description = "Maximum severity.";
type = types.enum ["HINT" "INFO" "WARNING" "ERROR"];
};
};
}; };
}; };
}; };