merge main into breadcrumbs

modules/ui/borders/borders.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkOption mkEnableOption types;
+
+  cfg = config.vim.ui.borders;
+
+  defaultStyles = ["none" "single" "double" "rounded"];
+in {
+  options.vim.ui.borders = {
+    enable = mkEnableOption "visible borders for most windows";
+
+    globalStyle = mkOption {
+      type = types.enum defaultStyles;
+      default = "rounded";
+      description = ''
+        global border style to use
+      '';
+    };
+
+    # TODO: make per-plugin borders configurable
+    plugins = let
+      mkPluginStyleOption = name: {
+        enable = mkEnableOption "whether to enable borders for the ${name} plugin" // {default = cfg.enable;};
+
+        style = mkOption {
+          type = types.enum (defaultStyles ++ lib.optionals (name != "which-key") ["shadow"]);
+          default = cfg.globalStyle;
+          description = "border style to use for the ${name} plugin";
+        };
+      };
+    in {
+      # despite not having it listed in example configuration, which-key does support the rounded type
+      # additionall, it supports a "shadow" type that is similar to none but is of higher contrast
+      which-key = mkPluginStyleOption "which-key";
+      lspsaga = mkPluginStyleOption "lspsaga";
+      nvim-cmp = mkPluginStyleOption "nvim-cmp";
+      lsp-signature = mkPluginStyleOption "lsp-signature";
+    };
+  };
+}

modules/ui/borders/default.nix

@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./borders.nix
+  ];
+}

modules/ui/breadcrumbs/config.nix

@@ -66,7 +66,7 @@ in {
 
           lsp = {
               auto_attach = ${boolToString nb.lsp.autoAttach},
-              preference = nil, -- TODO: convert list to lua table if not null
+              -- preference = nil, -- TODO: convert list to lua table if not null
           },
 
           source_buffer = {

modules/ui/default.nix

@@ -7,5 +7,6 @@ _: {
     ./colorizer
     ./illuminate
     ./breadcrumbs
+    ./borders
   ];
 }

modules/ui/noice/config.nix

@@ -32,7 +32,7 @@ in {
           command_palette = true, -- position the cmdline and popupmenu together
           long_message_to_split = true, -- long messages will be sent to a split
           inc_rename = false, -- enables an input dialog for inc-rename.nvim
-          lsp_doc_border = false, -- add a border to hover docs and signature help
+          lsp_doc_border = ${boolToString (config.vim.ui.borders.enable)}, -- add a border to hover docs and signature help
         },
 
         format = {