2 files changed, 20 insertions, 4 deletions
diff --git a/modules/development/nixvim/plugins/gitsigns.nix b/modules/development/nixvim/plugins/gitsigns.nix
index 28123fd..d9bda21 100644
--- a/modules/development/nixvim/plugins/gitsigns.nix
+++ b/modules/development/nixvim/plugins/gitsigns.nix
@@ -1,5 +1,13 @@
 # Git integration: signs, blame, diffs and hunk operations
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  base16Colors = import ../../../colors/base16 { inherit config lib pkgs; };
+in
 {
   config.programs.nixvim = lib.mkIf config.development.nixvim.enable {
     plugins.gitsigns = {
@@ -91,7 +99,7 @@
       };
     };
 
-    highlight = with config.scheme.withHashtag; {
+    highlight = with base16Colors.colorsWithHashPrefix; {
       GitSignsAdd.fg = base0B;
       GitSignsChange.fg = base0A;
       GitSignsDelete.fg = base08;
diff --git a/modules/development/nixvim/plugins/lualine.nix b/modules/development/nixvim/plugins/lualine.nix
index 560a055..55326ee 100644
--- a/modules/development/nixvim/plugins/lualine.nix
+++ b/modules/development/nixvim/plugins/lualine.nix
@@ -1,11 +1,19 @@
 # Statusline configuration
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  base16Colors = import ../../../colors/base16 { inherit config lib pkgs; };
+in
 {
   config.programs.nixvim.plugins.lualine = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       options = {
-        theme = with config.scheme.withHashtag; {
+        theme = with base16Colors.colorsWithHashPrefix; {
           normal = {
             a = {
               fg = base00;