raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-11-09 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: raf:a4e5a309c30cbf56a494142ac54964127b547b9d
Branches Tags
raf:main
raf:v0.7
raf:update-all-inputs
raf:gh-pages
raf:typos-and-friends
raf:feature/lzn
raf:spell-cleanup
raf:abstract-lspconfig
raf:refactor-languages
raf:visual-setupOpts
raf:update-inputs
raf:get-edgy
raf:undofile-opts
raf:get-based
raf:new-codeactions
raf:breadcrubs-lualine
raf:helper-scripts
raf:ts-error-translator
raf:bufferline-setupopts
raf:clean-up-plugins
raf:machine-tests
raf:minor-lang-refactor
raf:migrate-legacy-code
raf:treesitter
raf:sanitize-runtimepath
raf:v0.6
raf:plugin/chatgpt
raf:poc-formatted-lua
raf:plugins/fugitive
raf:v0.5
raf:restructure-tree
raf:dev/chadtree
raf:dev/misc
raf:feature/otter.nvim
raf:feature/nvim-debug
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2
...
compare: raf:ac01c1dff66e460a68ad53ee19ef687b15783e04
Branches Tags
raf:v0.7
raf:update-all-inputs
raf:gh-pages
raf:main
raf:typos-and-friends
raf:feature/lzn
raf:spell-cleanup
raf:abstract-lspconfig
raf:refactor-languages
raf:visual-setupOpts
raf:update-inputs
raf:get-edgy
raf:undofile-opts
raf:get-based
raf:new-codeactions
raf:breadcrubs-lualine
raf:helper-scripts
raf:ts-error-translator
raf:bufferline-setupopts
raf:clean-up-plugins
raf:machine-tests
raf:minor-lang-refactor
raf:migrate-legacy-code
raf:treesitter
raf:sanitize-runtimepath
raf:v0.6
raf:plugin/chatgpt
raf:poc-formatted-lua
raf:plugins/fugitive
raf:v0.5
raf:restructure-tree
raf:dev/chadtree
raf:dev/misc
raf:feature/otter.nvim
raf:feature/nvim-debug
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2

2 commits
a4e5a309c3 ... ac01c1dff6

Author SHA1 Message Date
Ching Pei Yang
ac01c1dff6
Merge 8b6b95b59a into 3f5ed9e979 2024-07-03 22:43:01 -04:00
Pei Yang Ching
8b6b95b59a lualine: use mkDefault on backwards compat configs 2024-06-25 16:23:31 +02:00
1 changed files with 23 additions and 23 deletions
Show stats Expand all files Collapse all files

46
modules/plugins/statusline/lualine/config.nix
View file

@ -4,7 +4,7 @@
... ...
}: let }: let
inherit (builtins) map; inherit (builtins) map;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge mkDefault;
inherit (lib.trivial) boolToString; inherit (lib.trivial) boolToString;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.lua) toLuaObject;
@ -23,7 +23,7 @@ in {
(mkIf (breadcrumbsCfg.enable && breadcrumbsCfg.source == "nvim-navic") { (mkIf (breadcrumbsCfg.enable && breadcrumbsCfg.source == "nvim-navic") {
vim.statusline.lualine.setupOpts = { vim.statusline.lualine.setupOpts = {
# TODO: rewrite in new syntax # TODO: rewrite in new syntax
winbar.lualine_c = [ winbar.lualine_c = mkDefault [
[ [
"navic" "navic"
(mkLuaInline "draw_empty = ${boolToString config.vim.ui.breadcrumbs.alwaysRender}") (mkLuaInline "draw_empty = ${boolToString config.vim.ui.breadcrumbs.alwaysRender}")
@ -41,36 +41,36 @@ in {
''; '';
# this is for backwards-compatibility # this is for backwards-compatibility
# NOTE: since lualine relies heavily on mixed list + key-value table syntax in lua e.g. {1, 2, three = 3}
# and we don't have a good syntax for that we're keeping the old options for now
statusline.lualine.setupOpts = { statusline.lualine.setupOpts = {
options = { options = {
icons_enabled = cfg.icons.enable; icons_enabled = mkDefault cfg.icons.enable;
theme = cfg.theme; theme = mkDefault cfg.theme;
component_separators = [cfg.componentSeparator.left cfg.componentSeparator.right]; component_separators = mkDefault [cfg.componentSeparator.left cfg.componentSeparator.right];
section_separators = [cfg.sectionSeparator.left cfg.sectionSeparator.right]; section_separators = mkDefault [cfg.sectionSeparator.left cfg.sectionSeparator.right];
globalstatus = cfg.globalStatus; globalstatus = mkDefault cfg.globalStatus;
refresh = cfg.refresh; refresh = mkDefault cfg.refresh;
always_divide_middle = mkDefault cfg.alwaysDivideMiddle;
}; };
sections = { sections = {
lualine_a = map mkLuaInline (cfg.activeSection.a ++ cfg.extraActiveSection.a); lualine_a = mkDefault (map mkLuaInline (cfg.activeSection.a ++ cfg.extraActiveSection.a));
lualine_b = map mkLuaInline (cfg.activeSection.b ++ cfg.extraActiveSection.b); lualine_b = mkDefault (map mkLuaInline (cfg.activeSection.b ++ cfg.extraActiveSection.b));
lualine_c = map mkLuaInline (cfg.activeSection.c ++ cfg.extraActiveSection.c); lualine_c = mkDefault (map mkLuaInline (cfg.activeSection.c ++ cfg.extraActiveSection.c));
lualine_x = map mkLuaInline (cfg.activeSection.x ++ cfg.extraActiveSection.x); lualine_x = mkDefault (map mkLuaInline (cfg.activeSection.x ++ cfg.extraActiveSection.x));
lualine_y = map mkLuaInline (cfg.activeSection.y ++ cfg.extraActiveSection.y); lualine_y = mkDefault (map mkLuaInline (cfg.activeSection.y ++ cfg.extraActiveSection.y));
lualine_z = map mkLuaInline (cfg.activeSection.z ++ cfg.extraActiveSection.z); lualine_z = mkDefault (map mkLuaInline (cfg.activeSection.z ++ cfg.extraActiveSection.z));
}; };
inactive_sections = { inactive_sections = {
lualine_a = map mkLuaInline (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a); lualine_a = mkDefault (map mkLuaInline (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a));
lualine_b = map mkLuaInline (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b); lualine_b = mkDefault (map mkLuaInline (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b));
lualine_c = map mkLuaInline (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c); lualine_c = mkDefault (map mkLuaInline (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c));
lualine_x = map mkLuaInline (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x); lualine_x = mkDefault (map mkLuaInline (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x));
lualine_y = map mkLuaInline (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y); lualine_y = mkDefault (map mkLuaInline (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y));
lualine_z = map mkLuaInline (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z); lualine_z = mkDefault (map mkLuaInline (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z));
}; };
# probably don't need this?
tabline = [];
}; };
}; };
}) })