Change border_style to a more adaptable border_style with options

README.md

@@ -103,8 +103,8 @@ require('nordic').setup({
         -- Enable transparent background for floating windows.
         float = false,
     },
-    -- Enable brighter float border.
-    bright_border = false,
+    -- Options: "flat", "bright", "default"
+    border_style = 'default',
     -- Reduce the overall amount of blue in the theme (diverges from base Nord).
     reduced_blue = true,
     -- Swap the dark background with the normal one.

doc/nordic.nvim.txt

@@ -133,8 +133,8 @@ default configuration.
             -- Enable transparent background for floating windows.
             float = false,
         },
-        -- Enable brighter float border.
-        bright_border = false,
+	-- Options: "flat", "bright", "default"
+	border_style = 'default',
         -- Reduce the overall amount of blue in the theme (diverges from base Nord).
         reduced_blue = true,
         -- Swap the dark background with the normal one.

lua/nordic/colors/init.lua

@@ -46,7 +46,9 @@ function C.build_palette()
         or U.blend(options.cursorline.bg, C.bg, options.cursorline.blend)
 
     -- Borders
-    C.border_fg = (options.bright_border and C.white0) or C.black0
+    C.border_fg = (options.border_style == 'bright' and C.white0)
+        or options.border_style == 'default' and C.black0
+        or options.border_style == 'flat' and C.border_bg
     C.border_bg = (options.transparent.bg and C.none) or C.bg
 
     -- Foregrounds
@@ -61,7 +63,9 @@ function C.build_palette()
     C.bg_float = (options.transparent.float and C.none) or ((options.swap_backgrounds and C.gray0) or C.black1)
     C.fg_float = C.fg
     C.bg_float_border = C.bg_float
-    C.fg_float_border = C.border_fg
+    C.fg_float_border = options.border_style == 'bright' and C.white0
+        or options.border_style == 'default' and C.black0
+        or options.border_style == 'flat' and C.bg_float_border
 
     -- Popups
     C.bg_popup = C.bg_float

lua/nordic/config.lua

@@ -22,8 +22,8 @@ local defaults = {
         -- Enable transparent background for floating windows.
         float = false,
     },
-    -- Enable brighter float border.
-    bright_border = false,
+    -- Options: "flat", "bright", "default"
+    border_style = 'default',
     -- Reduce the overall amount of blue in the theme (diverges from base Nord).
     reduced_blue = true,
     -- Swap the dark background with the normal one.

lua/nordic/groups/native.lua

@@ -156,7 +156,7 @@ function M.get_groups()
     -- TermCursorNC= { } -- cursor in an unfocused terminal
     G.ErrorMsg = { fg = C.error } -- error messages on the command line
     G.VertSplit = { fg = C.border_fg } -- the column separating vertically split windows
-    G.WinSeparator = { fg = C.border_fg, bg = C.border_bg } -- the column separating vertically split windows
+    G.WinSeparator = { fg = O.border_style == 'bright' and C.white0 or C.black0, bg = C.border_bg } -- the column separating vertically split windows
     G.Folded = { fg = C.fg_fold, bg = C.bg_fold } -- line used for closed folds
     G.FoldColumn = { bg = C.bg_fold, fg = C.fg_fold } -- 'foldcolumn'
     G.SignColumn = { bg = C.bg_sidebar, fg = C.fg_sidebar } -- column where |signs| are displayed

lua/nordic/tests/options.lua

@@ -117,20 +117,26 @@ assert_eq(
 )
 load({ transparent = { float = false } })
 
--- bright_border
+-- border_style
 assert_eq(
     get_highlight('WinSeparator').fg,
     base_palette.black0,
-    'bright_border: all highlights that use `border_fg` should be `black0` by default'
+    'border_style: all highlights that use `border_fg` should be `black0` if `border_style` is `default`'
 )
-load({ bright_border = true })
+load({ border_style = 'flat' })
+assert_eq(
+    get_highlight('VertSplit').fg,
+    base_palette.gray0,
+    'border_style: all highlights that use `border_fg` should be `gray0` if `border_style` is `flat`'
+)
+load({ border_style = 'bright' })
 -- NOTE: This will fail if the wrong white0 variant is used
 assert_eq(
     get_highlight('WinSeparator').fg,
     base_palette.white0_reduce_blue,
-    'bright_border: all highlights that use `border_fg` should be `white0_reduce_blue` if `bright_border` is true'
+    'border_style: all highlights that use `border_fg` should be `white0_reduce_blue` if `border_style` is `bright`'
 )
-load({ bright_border = false })
+load({ border_style = 'default' })
 
 -- reduced_blue
 assert_eq(