From 6f12bf015065a510fac28fb0db61e2edd6112859 Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Tue, 5 Dec 2023 18:07:19 +0100
Subject: [PATCH] feat(modules/programs/nixvim): add color scheme

Closes: 6784a66b828986af55222307ed7759887cc94042
Requires: https://github.com/danth/stylix/pull/194
---
 flake.lock                                    | 11 ++++----
 flake.nix                                     |  2 +-
 .../programs/nixvim/colorschemes/default.nix  | 27 -------------------
 modules/programs/nixvim/default.nix           |  7 +----
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 modules/programs/nixvim/colorschemes/default.nix

diff --git a/flake.lock b/flake.lock
index a1ffba47..f7f5614e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -398,15 +398,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1701532764,
-        "narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=",
-        "owner": "danth",
+        "lastModified": 1701798883,
+        "narHash": "sha256-wv15ahlMEfLXPq8CW08GC7VP54INaCF8pcESXt26kNc=",
+        "owner": "willemml",
         "repo": "stylix",
-        "rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4",
+        "rev": "2ed2b0086b41d582aca26e083c19c0e47c8991e3",
         "type": "github"
       },
       "original": {
-        "owner": "danth",
+        "owner": "willemml",
+        "ref": "feat/modules/nixvim-transparency",
         "repo": "stylix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 29b621a5..09e22b65 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,7 @@
         nixpkgs.follows = "nixpkgs";
       };
 
-      url = "github:danth/stylix";
+      url = "github:willemml/stylix/feat/modules/nixvim-transparency";
     };
 
     triPaneXplr = {
diff --git a/modules/programs/nixvim/colorschemes/default.nix b/modules/programs/nixvim/colorschemes/default.nix
deleted file mode 100644
index da1bcd6b..00000000
--- a/modules/programs/nixvim/colorschemes/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{config, ...}: {
-  programs.nixvim.colorschemes.base16 = {
-    enable = true;
-
-    customColorScheme = let
-      colors = config.lib.stylix.colors;
-      prependHash = color: "#${color}";
-    in {
-      base00 = prependHash colors.base00;
-      base01 = prependHash colors.base01;
-      base02 = prependHash colors.base02;
-      base03 = prependHash colors.base03;
-      base04 = prependHash colors.base04;
-      base05 = prependHash colors.base05;
-      base06 = prependHash colors.base06;
-      base07 = prependHash colors.base07;
-      base08 = prependHash colors.base08;
-      base09 = prependHash colors.base09;
-      base0A = prependHash colors.base0A;
-      base0B = prependHash colors.base0B;
-      base0C = prependHash colors.base0C;
-      base0D = prependHash colors.base0D;
-      base0E = prependHash colors.base0E;
-      base0F = prependHash colors.base0F;
-    };
-  };
-}
diff --git a/modules/programs/nixvim/default.nix b/modules/programs/nixvim/default.nix
index 8a8bfdf2..5fef80ee 100644
--- a/modules/programs/nixvim/default.nix
+++ b/modules/programs/nixvim/default.nix
@@ -7,9 +7,7 @@
 }: {
   imports = [
     ../../homeManager/home/packages/rustup
-    ../../stylix
     ./autoCmd
-    ./colorschemes
     ./keymaps
     ./options
     ./plugins
@@ -19,10 +17,7 @@
   options.modules.programs.nixvim.enable = lib.mkEnableOption "nixvim";
 
   config = lib.mkIf config.modules.programs.nixvim.enable {
-    modules = {
-      homeManager.home.packages.rustup.enable = true;
-      stylix.enable = true;
-    };
+    modules.homeManager.home.packages.rustup.enable = true;
 
     home = let
       neovim = pkgs.neovim.meta.mainProgram;