docs/release-notes/rl-0.7.md

@@ -6,7 +6,7 @@ Release notes for release 0.7
 
 [ItsSorae](https://github.com/ItsSorae):
 
-- Add support for [typst](https://typst.app/) under `vim.languages.typst` This
+- Added support for [typst](https://typst.app/) under `vim.languages.typst` This
   will enable the `typst-lsp` language server, and the `typstfmt` formatter
 
 [frothymarrow](https://github.com/frothymarrow):
@@ -15,9 +15,6 @@ Release notes for release 0.7
   [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) from
   `anything` to a `submodule` for better type checking.
 - Fix null `vim.lsp.mappings` generating an error and not being filtered out.
-- Add basic transparency support for `oxocarbon` theme by setting the
-  highlight group for `Normal`, `NormalFloat`, `LineNr`, `SignColumn` and
-  optionally `NvimTreeNormal` to `none`.
 
 [horriblename](https://github.com/horriblename):
 
@@ -41,9 +38,9 @@ Release notes for release 0.7
 
 - Remove vim-tidal and friends
 
-- Clean up Lualine module to reduce theme dependency on Catppuccin, and fixed
+- Cleaned up Lualine module to reduce theme dependency on Catppuccin, and fixed
   blending issues in component separators.
 
 [jacekpoz](https://github.com/jacekpoz):
 
-- Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
+- Added [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.

modules/plugins/theme/supported_themes.nix

@@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-}: let
-  inherit (lib.strings) optionalString;
-  inherit (lib.trivial) boolToString warnIf;
-in {
+{lib}: {
   onedark = {
     setup = {
       style ? "dark",
@@ -25,7 +19,7 @@ in {
       transparent,
     }: ''
       require('tokyonight').setup {
-        transparent = ${boolToString transparent};
+        transparent = ${lib.boolToString transparent};
       }
       vim.cmd[[colorscheme tokyonight-${style}]]
     '';
@@ -38,7 +32,7 @@ in {
       transparent,
     }: ''
       require('dracula').setup({
-        transparent_bg = ${boolToString transparent},
+        transparent_bg = ${lib.boolToString transparent},
       });
       require('dracula').load();
     '';
@@ -52,11 +46,11 @@ in {
       -- Catppuccin theme
       require('catppuccin').setup {
         flavour = "${style}",
-        transparent_background = ${boolToString transparent},
+        transparent_background = ${lib.boolToString transparent},
         integrations = {
       	  nvimtree = {
       		  enabled = true,
-      		  transparent_panel = ${boolToString transparent},
+      		  transparent_panel = ${lib.boolToString transparent},
       		  show_root = true,
       	  },
 
@@ -91,20 +85,11 @@ in {
       transparent ? false,
     }: let
       style' =
-        warnIf (style == "light") "oxocarbon: light theme is not well-supported" style;
+        lib.warnIf (style == "light") "oxocarbon: light theme is not well-supported" style;
     in ''
-       require('oxocarbon')
-       vim.opt.background = "${style'}"
-       vim.cmd.colorscheme = "oxocarbon"
-      ${optionalString transparent ''
-        vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-        vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-        vim.api.nvim_set_hl(0, "LineNr", { bg = "none" })
-        vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" })
-        ${lib.optionalString config.vim.filetree.nvimTree.enable ''
-          vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
-        ''}
-      ''}
+      require('oxocarbon')
+      vim.opt.background = "${style'}"
+      vim.cmd.colorscheme = "oxocarbon"
     '';
     styles = ["dark" "light"];
   };
@@ -137,7 +122,7 @@ in {
         palette_overrides = {},
         overrides = {},
         dim_inactive = false,
-        transparent_mode = ${boolToString transparent},
+        transparent_mode = ${lib.boolToString transparent},
       })
       vim.o.background = "${style}"
       vim.cmd("colorscheme gruvbox")
@@ -162,7 +147,7 @@ in {
         styles = {
           bold = false,
           italic = false, -- I would like to add more options for this
-          transparency = ${boolToString transparent},
+          transparency = ${lib.boolToString transparent},
         },
       })
 

modules/plugins/theme/theme.nix

@@ -10,9 +10,7 @@
   inherit (lib.nvim.dag) entryBefore;
 
   cfg = config.vim.theme;
-  supported_themes = import ./supported_themes.nix {
-    inherit lib config;
-  };
+  supported_themes = import ./supported_themes.nix {inherit lib;};
 in {
   options.vim.theme = {
     enable = mkOption {