chore: projectwide refactoring

- Using more consistent naming conventions across the project. Using java style super
descriptive variable names.
- Removed slop comments in favor of using more descriptive naming conventions.

3 files changed, 14 insertions, 3 deletions

diff --git a/modules/terminal/bat/default.nix b/modules/terminal/bat/default.nix
index 8e089ce..69045bc 100644
--- a/modules/terminal/bat/default.nix
+++ b/modules/terminal/bat/default.nix
@@ -5,6 +5,9 @@
   pkgs,
   ...
 }:
+let
+  base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+in
 {
   options.terminal.bat = {
     enable = lib.mkEnableOption "Enables bat.";
@@ -26,7 +29,7 @@
         base16 = {
           src = pkgs.runCommand "bat-base16-theme" { } ''
             mkdir -p $out
-            cp ${config.scheme { template = ./base16.tmTheme; }} $out/base16.tmTheme
+            cp ${base16Colors { templateFileOrContent = ./base16.tmTheme; }} $out/base16.tmTheme
           '';
           file = "base16.tmTheme";
         };
diff --git a/modules/terminal/fzf/default.nix b/modules/terminal/fzf/default.nix
index 613134e..a7cc2f5 100644
--- a/modules/terminal/fzf/default.nix
+++ b/modules/terminal/fzf/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+in
 {
   imports = [ ./assertions.nix ];
 
@@ -39,7 +43,7 @@
           "--margin='1,2'"
         ];
 
-        colors = with config.scheme.withHashtag; {
+        colors = with base16Colors.colorsWithHashPrefix; {
           fg = base05;
           bg = "-1";
           hl = base0D;
diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix
index 0e293bd..d840667 100644
--- a/modules/terminal/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+in
 {
   options.terminal.kitty = {
     enable = lib.mkEnableOption "Enables kitty.";
@@ -41,7 +45,7 @@
         map ctrl+shift+u scroll_page_up
         map ctrl+shift+d scroll_page_down
       '';
-      settings = with config.scheme.withHashtag; {
+      settings = with base16Colors.colorsWithHashPrefix; {
         window_padding_width = 10;
         font_size = config.fonts.size;
         font_family = config.fonts.normal;