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.

4 files changed, 35 insertions, 24 deletions

diff --git a/modules/development/nixvim/colorscheme.nix b/modules/development/nixvim/colorscheme.nix
index 3ab5bc4..560f6ce 100644
--- a/modules/development/nixvim/colorscheme.nix
+++ b/modules/development/nixvim/colorscheme.nix
@@ -2,30 +2,17 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+in
 {
   config.programs.nixvim = lib.mkIf config.development.nixvim.enable {
     colorschemes.base16 = {
       enable = true;
-      colorscheme = with config.scheme.withHashtag; {
-        base00 = base00;
-        base01 = base01;
-        base02 = base02;
-        base03 = base03;
-        base04 = base04;
-        base05 = base05;
-        base06 = base06;
-        base07 = base07;
-        base08 = base08;
-        base09 = base09;
-        base0A = base0A;
-        base0B = base0B;
-        base0C = base0C;
-        base0D = base0D;
-        base0E = base0E;
-        base0F = base0F;
-      };
+      colorscheme = base16Colors.colorsWithHashPrefix;
     };
   };
 }
diff --git a/modules/development/nixvim/default.nix b/modules/development/nixvim/default.nix
index 8506b7d..74b0c1f 100644
--- a/modules/development/nixvim/default.nix
+++ b/modules/development/nixvim/default.nix
@@ -1,5 +1,13 @@
 # Neovim configured through Nix
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
+in
 {
   imports = [
     ./colorscheme.nix
@@ -44,7 +52,7 @@
       globals.mapleader = " ";
       clipboard.providers.xclip.enable = true;
 
-      highlight = with config.scheme.withHashtag; {
+      highlight = with base16Colors.colorsWithHashPrefix; {
         WinSeparator = {
           fg = base01;
           bg = base00;
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;