docs/release-notes/rl-0.7.md

@@ -35,6 +35,3 @@ Release notes for release 0.7
   to nixpkgs. A pull request is currently open.
 
 - Remove vim-tidal and friends
-
-- Cleaned up Lualine module to reduce theme dependency on Catppuccin, and fixed
-  blending issues in component separators.

modules/plugins/statusline/lualine/config.nix

@@ -3,7 +3,6 @@
   lib,
   ...
 }: let
-  inherit (builtins) map;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.trivial) boolToString;
   inherit (lib.nvim.dag) entryAnywhere;
@@ -32,16 +31,17 @@ in {
       };
     })
     (mkIf cfg.enable {
-      vim = {
-        startPlugins = ["lualine"];
+      vim.startPlugins = [
+        "lualine"
+      ];
 
-        luaConfigRC.lualine = entryAnywhere ''
+      vim.luaConfigRC.lualine = entryAnywhere ''
         local lualine = require('lualine')
         lualine.setup ${toLuaObject cfg.setupOpts}
       '';
 
       # this is for backwards-compatibility
-        statusline.lualine.setupOpts = {
+      vim.statusline.lualine.setupOpts = {
         options = {
           icons_enabled = cfg.icons.enable;
           theme = cfg.theme;
@@ -52,27 +52,24 @@ in {
         };
 
         sections = {
-            lualine_a = map mkLuaInline (cfg.activeSection.a ++ cfg.extraActiveSection.a);
-            lualine_b = map mkLuaInline (cfg.activeSection.b ++ cfg.extraActiveSection.b);
-            lualine_c = map mkLuaInline (cfg.activeSection.c ++ cfg.extraActiveSection.c);
-            lualine_x = map mkLuaInline (cfg.activeSection.x ++ cfg.extraActiveSection.x);
-            lualine_y = map mkLuaInline (cfg.activeSection.y ++ cfg.extraActiveSection.y);
-            lualine_z = map mkLuaInline (cfg.activeSection.z ++ cfg.extraActiveSection.z);
+          lualine_a = builtins.map mkLuaInline (cfg.activeSection.a ++ cfg.extraActiveSection.a);
+          lualine_b = builtins.map mkLuaInline (cfg.activeSection.b ++ cfg.extraActiveSection.b);
+          lualine_c = builtins.map mkLuaInline (cfg.activeSection.c ++ cfg.extraActiveSection.c);
+          lualine_x = builtins.map mkLuaInline (cfg.activeSection.x ++ cfg.extraActiveSection.x);
+          lualine_y = builtins.map mkLuaInline (cfg.activeSection.y ++ cfg.extraActiveSection.y);
+          lualine_z = builtins.map mkLuaInline (cfg.activeSection.z ++ cfg.extraActiveSection.z);
         };
-
         inactive_sections = {
-            lualine_a = map mkLuaInline (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a);
-            lualine_b = map mkLuaInline (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b);
-            lualine_c = map mkLuaInline (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c);
-            lualine_x = map mkLuaInline (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x);
-            lualine_y = map mkLuaInline (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y);
-            lualine_z = map mkLuaInline (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z);
+          lualine_a = builtins.map mkLuaInline (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a);
+          lualine_b = builtins.map mkLuaInline (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b);
+          lualine_c = builtins.map mkLuaInline (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c);
+          lualine_x = builtins.map mkLuaInline (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x);
+          lualine_y = builtins.map mkLuaInline (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y);
+          lualine_z = builtins.map mkLuaInline (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z);
         };
-
         # probably don't need this?
         tabline = [];
       };
-      };
     })
   ];
 }

modules/plugins/statusline/lualine/lualine.nix

@@ -10,45 +10,19 @@
   inherit (lib.nvim.types) mkPluginSetupOption;
 
   supported_themes = import ./supported_themes.nix;
-  builtin_themes = [
-    "auto"
-    "16color"
-    "gruvbox"
-    "ayu_dark"
-    "ayu_light"
-    "ayu_mirage"
-    "codedark"
-    "dracula"
-    "everforest"
-    "gruvbox"
-    "gruvbox_light"
-    "gruvbox_material"
-    "horizon"
-    "iceberg_dark"
-    "iceberg_light"
-    "jellybeans"
-    "material"
-    "modus_vivendi"
-    "molokai"
-    "nightfly"
-    "nord"
-    "oceanicnext"
-    "onelight"
-    "palenight"
-    "papercolor_dark"
-    "papercolor_light"
-    "powerline"
-    "seoul256"
-    "solarized_dark"
-    "tomorrow"
-    "wombat"
-  ];
+  colorPuccin =
+    if config.vim.statusline.lualine.theme == "catppuccin"
+    then "#181825"
+    else "none";
 in {
   options.vim.statusline.lualine = {
-    enable = mkEnableOption "lualine statusline plugin";
     setupOpts = mkPluginSetupOption "Lualine" {};
 
-    icons.enable = mkEnableOption "icons for lualine" // {default = true;};
+    enable = mkEnableOption "lualine statusline plugin";
+
+    icons = {
+      enable = mkEnableOption "icons for lualine" // {default = true;};
+    };
 
     refresh = {
       statusline = mkOption {
@@ -99,15 +73,47 @@ in {
 
     theme = let
       themeSupported = elem config.vim.theme.name supported_themes;
-      themesConcatted = builtin_themes ++ optional themeSupported config.vim.theme.name;
     in
       mkOption {
-        type = enum themesConcatted;
+        description = "Theme for lualine";
+        type = enum ([
+            "auto"
+            "16color"
+            "gruvbox"
+            "ayu_dark"
+            "ayu_light"
+            "ayu_mirage"
+            "codedark"
+            "dracula"
+            "everforest"
+            "gruvbox"
+            "gruvbox_light"
+            "gruvbox_material"
+            "horizon"
+            "iceberg_dark"
+            "iceberg_light"
+            "jellybeans"
+            "material"
+            "modus_vivendi"
+            "molokai"
+            "nightfly"
+            "nord"
+            "oceanicnext"
+            "onelight"
+            "palenight"
+            "papercolor_dark"
+            "papercolor_light"
+            "powerline"
+            "seoul256"
+            "solarized_dark"
+            "tomorrow"
+            "wombat"
+          ]
+          ++ optional themeSupported config.vim.theme.name);
         default = "auto";
         # TODO: xml generation error if the closing '' is on a new line.
         # issue: https://gitlab.com/rycee/nmd/-/issues/10
         defaultText = ''`config.vim.theme.name` if theme supports lualine else "auto"'';
-        description = "Theme for lualine";
       };
 
     sectionSeparator = {
@@ -165,14 +171,15 @@ in {
               "filetype",
               colored = true,
               icon_only = true,
-              icon = { align = 'left' }
+              icon = { align = 'left' },
+              color = {bg='${colorPuccin}', fg='lavender'},
             }
           ''
           ''
             {
               "filename",
-              symbols = {modified = ' ', readonly = ' '},
-              separator = {right = ''}
+              color = {bg='${colorPuccin}'},
+              symbols = {modified = '', readonly = ''},
             }
           ''
         ];
@@ -193,7 +200,13 @@ in {
                 removed  = 'DiffDelete', -- Changes the diff's removed color you
               },
               symbols = {added = '+', modified = '~', removed = '-'}, -- Changes the diff symbols
-              separator = {right = ''}
+              color = {
+                bg='${colorPuccin}',
+                fg='lavender'
+              },
+              separator = {
+                right = ''
+              },
             }
           ''
         ];
@@ -238,6 +251,10 @@ in {
                 return msg
               end,
               icon = ' ',
+              color = {bg='${colorPuccin}', fg='lavender'},
+              separator = {
+                left = '',
+              },
             }
           ''
           ''
@@ -245,6 +262,7 @@ in {
               "diagnostics",
               sources = {'nvim_lsp', 'nvim_diagnostic', 'coc'},
               symbols = {error = '󰅙  ', warn = '  ', info = '  ', hint = '󰌵 '},
+              color = {bg='${colorPuccin}', fg='lavender'},
               diagnostics_color = {
                 color_error = { fg = 'red' },
                 color_warn = { fg = 'yellow' },
@@ -264,16 +282,14 @@ in {
               'searchcount',
               maxcount = 999,
               timeout = 120,
-
+              color = {bg='${colorPuccin}', fg='lavender'}
             }
           ''
           ''
             {
               "branch",
               icon = ' •',
-              separator = {
-                left = '',
-              },
+              color = {bg='${colorPuccin}', fg='lavender'},
             }
           ''
         ];
@@ -284,10 +300,17 @@ in {
         description = "active config for: | A | B | C       X | Y | (Z) |";
         default = [
           ''
-            {"progress"}
+            {
+              "progress",
+              separator = {
+                left = '',
+              },
+            }
           ''
           ''
-            {"location"}
+            {
+              "location",
+            }
           ''
           ''
             {
@@ -303,38 +326,32 @@ in {
         ];
       };
     };
-
     extraActiveSection = {
       a = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.a";
         default = [];
       };
-
       b = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.b";
         default = [];
       };
-
       c = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.c";
         default = [];
       };
-
       x = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.x";
         default = [];
       };
-
       y = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.y";
         default = [];
       };
-
       z = mkOption {
         type = listOf str;
         description = "Extra entries for activeSection.z";
@@ -385,31 +402,26 @@ in {
         description = "Extra entries for inactiveSection.a";
         default = [];
       };
-
       b = mkOption {
         type = listOf str;
         description = "Extra entries for inactiveSection.b";
         default = [];
       };
-
       c = mkOption {
         type = listOf str;
         description = "Extra entries for inactiveSection.c";
         default = [];
       };
-
       x = mkOption {
         type = listOf str;
         description = "Extra entries for inactiveSection.x";
         default = [];
       };
-
       y = mkOption {
         type = listOf str;
         description = "Extra entries for inactiveSection.y";
         default = [];
       };
-
       z = mkOption {
         type = listOf str;
         description = "Extra entries for inactiveSection.z";