fix: fix lib

mrjones2014 · May 23, 2024 · 8b750c8 · 8b750c8
1 parent ffbebaf
commit 8b750c8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 21 deletions.
diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix
@@ -1,9 +1,7 @@
 { inputs, config, lib, ... }:
 let cfg = config.programs.bat.tokyonight;
 in {
-  options.programs.bat.tokyonight = {
-    enable = lib.mkEnableOption "tokyonight colorscheme";
-  };
+  options.programs.bat.tokyonight = lib.tn.mkTokyonightOpt "tokyonight bat";
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       programs.bat = {

diff --git a/modules/home-manager/delta.nix b/modules/home-manager/delta.nix
@@ -2,7 +2,7 @@
 let cfg = config.programs.git.delta.tokyonight;
 in {
   options.programs.git.delta.tokyonight =
-    lib.mkTokyonightOpt "tokyonight git delta";
+    lib.tn.mkTokyonightOpt "tokyonight git delta";
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       programs.git = {

diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix
@@ -1,9 +1,7 @@
 { inputs, config, lib, ... }:
 let cfg = config.programs.fish.tokyonight;
 in {
-  options.programs.fish.tokyonight = {
-    enable = lib.mkEnableOption "tokyonight colorscheme";
-  };
+  options.programs.fish.tokyonight = lib.tn.mkTokyonightOpt "tokyonight fish";
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       programs.fish.interactiveShellInit = builtins.readFile

diff --git a/modules/home-manager/fzf.nix b/modules/home-manager/fzf.nix
@@ -1,9 +1,7 @@
 { inputs, config, lib, ... }:
 let cfg = config.programs.fzf.tokyonight;
 in {
-  options.programs.fzf.tokyonight = {
-    enable = lib.mkEnableOption "tokyonight colorscheme";
-  };
+  options.programs.fzf.tokyonight = lib.tn.mkTokyonightOpt "tokyonight fzf";
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       programs = {

diff --git a/modules/home-manager/neovim.nix b/modules/home-manager/neovim.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 let cfg = config.programs.neovim.tokyonight;
 in {
-  options.programs.neovim.tokyonight = (lib.mkTokyonightOpt "tokyonight neovim")
-    // {
+  options.programs.neovim.tokyonight =
+    (lib.tn.mkTokyonightOpt "tokyonight neovim") // {
       extraLua = lib.mkOption {
         type = lib.types.lines;
         default = ''

diff --git a/modules/home-manager/rofi.nix b/modules/home-manager/rofi.nix
@@ -1,15 +1,15 @@
 { inputs, config, lib, ... }:
 let cfg = config.programs.rofi.tokyonight;
 in {
-  options.programs.rofi.tokyonight = {
-    enable = lib.mkEnableOption "tokyonight colorscheme";
-    variant = lib.mkOption {
-      type = lib.types.enum [ "default" "big1" "big2" ];
-      description =
-        "Which variant to use, see: https://github.com/w8ste/Tokyonight-rofi-theme";
-      default = "default";
+  options.programs.rofi.tokyonight = (lib.tn.mkTokyonightOpt "tokyonight rofi")
+    // {
+      variant = lib.mkOption {
+        type = lib.types.enum [ "default" "big1" "big2" ];
+        description =
+          "Which variant to use, see: https://github.com/w8ste/Tokyonight-rofi-theme";
+        default = "default";
+      };
     };
-  };
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       programs.rofi = {

diff --git a/modules/lib/mkImports.nix b/modules/lib/mkImports.nix
@@ -7,7 +7,8 @@ let
   # in our list, we import them directly
   applyImports = file: _:
     import "${dir}/${file}" (args // {
-      lib = lib.extend (final: _: (import ./. (args // { lib = final; })));
+      lib =
+        lib.extend (final: _: { tn = import ./. (args // { lib = final; }); });
 
       defaultSources = import ../../.sources;
     });