Using more descriptive option names.

10 files changed, 129 insertions, 129 deletions

diff --git a/modules/tools/editor/default.nix b/modules/tools/editor/default.nix
index 1a146bf..fd2da1a 100644
--- a/modules/tools/editor/default.nix
+++ b/modules/tools/editor/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/tools/editor/neovim/default.nix b/modules/tools/editor/neovim/default.nix
index e06ec88..6cf3b50 100644
--- a/modules/tools/editor/neovim/default.nix
+++ b/modules/tools/editor/neovim/default.nix
@@ -1,11 +1,11 @@
 { pkgs, config, lib, ... }:
 
 {
-	options = {
-		neovim.enable = lib.mkEnableOption "Enables neovim.";
+	options.tools.editor.neovim = {
+		enable = lib.mkEnableOption "Enables neovim.";
 	};
 
-	config = lib.mkIf config.neovim.enable {
+	config = lib.mkIf config.tools.editor.neovim.enable {
 		programs.neovim.enable = true;
 		programs.neovim.viAlias = true;
 		programs.neovim.vimAlias = true;
diff --git a/modules/tools/file-manager/default.nix b/modules/tools/file-manager/default.nix
index d127a66..fc5eb46 100644
--- a/modules/tools/file-manager/default.nix
+++ b/modules/tools/file-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ ... }:
 
 {
 	imports = [
diff --git a/modules/tools/file-manager/lf/default.nix b/modules/tools/file-manager/lf/default.nix
index 00784cf..30ed421 100644
--- a/modules/tools/file-manager/lf/default.nix
+++ b/modules/tools/file-manager/lf/default.nix
@@ -1,11 +1,11 @@
 { config, pkgs, lib, ... }:
 
 {
-	options = {
-		lf.enable = lib.mkEnableOption "Enables lf.";
+	options.tools.file-manager.lf = {
+		enable = lib.mkEnableOption "Enables lf.";
 	};
 
-	config = lib.mkIf config.lf.enable {
+	config = lib.mkIf config.tools.file-manager.lf.enable {
 		programs.lf.enable = true;
 		programs.lf.settings = {
 			hidden = true;
diff --git a/modules/tools/file-manager/lsd/default.nix b/modules/tools/file-manager/lsd/default.nix
index 0f57e6b..5b940ab 100644
--- a/modules/tools/file-manager/lsd/default.nix
+++ b/modules/tools/file-manager/lsd/default.nix
@@ -1,14 +1,14 @@
 { pkgs, lib, config, ... }:
 
 {
-	options = {
-		lsd.enable = lib.mkEnableOption "Enables lsd.";
+	options.tools.file-manager.lsd = {
+		enable = lib.mkEnableOption "Enables lsd.";
 	};
 
-	config = lib.mkIf config.lsd.enable {
+	config = lib.mkIf config.tools.file-manager.lsd.enable {
 		programs.lsd.enable = true;
 		programs.lsd.enableAliases = true;
-		programs.bash.shellAliases."tree" = "${pkgs.lsd}/bin/lsd -a --tree";
+		shell.alias."tree" = "${pkgs.lsd}/bin/lsd -a --tree";
 
 		programs.lsd.settings = {
 			icons.separator = "  ";
diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix
index 7396cb8..1dadacf 100644
--- a/modules/tools/git/default.nix
+++ b/modules/tools/git/default.nix
@@ -1,11 +1,11 @@
 { lib, config, ... }:
 
 {
-	options = {
-		git.enable = lib.mkEnableOption "Enables git.";
+	options.tools.git = {
+		enable = lib.mkEnableOption "Enables git.";
 	};
 
-	config = lib.mkIf config.git.enable {
+	config = lib.mkIf config.tools.git.enable {
 		programs.git.enable = true;
 		programs.git.userEmail = "54011232+arpitchakladar@users.noreply.github.com";
 		programs.git.userName = "Arpit Chakladar";
diff --git a/modules/tools/system-monitor/htop/default.nix b/modules/tools/system-monitor/htop/default.nix
index f27174a..c19ab60 100644
--- a/modules/tools/system-monitor/htop/default.nix
+++ b/modules/tools/system-monitor/htop/default.nix
@@ -1,11 +1,11 @@
 { pkgs, lib, config, ... }:
 
 {
-	options = {
-		htop.enable = lib.mkEnableOption "Enables htop.";
+	options.tools.system-monitor.htop = {
+		enable = lib.mkEnableOption "Enables htop.";
 	};
 
-	config = lib.mkIf config.htop.enable {
+	config = lib.mkIf config.tools.system-monitor.htop.enable {
 		programs.htop.enable = true;
 		programs.htop.package = pkgs.htop-vim;
 	};
diff --git a/modules/tools/viewer/bat/default.nix b/modules/tools/viewer/bat/default.nix
index cc01f82..915b4b2 100644
--- a/modules/tools/viewer/bat/default.nix
+++ b/modules/tools/viewer/bat/default.nix
@@ -1,11 +1,11 @@
 { config, lib, ... }:
 
 {
-	options = {
-		bat.enable = lib.mkEnableOption "Enables bat.";
+	options.tools.viewer.bat = {
+		enable = lib.mkEnableOption "Enables bat.";
 	};
 
-	config = lib.mkIf config.bat.enable {
+	config = lib.mkIf config.tools.viewer.bat.enable {
 		programs.bat.enable = true;
 		programs.bat.config.theme = "customTheme";
 		xdg.configFile."bat/themes/customTheme.tmTheme".text
diff --git a/modules/tools/viewer/bat/theme.nix b/modules/tools/viewer/bat/theme.nix
index e345ee4..dc22ceb 100644
--- a/modules/tools/viewer/bat/theme.nix
+++ b/modules/tools/viewer/bat/theme.nix
@@ -5,120 +5,120 @@ with config.scheme.withHashtag;
 <?xml version="1.0" encoding="UTF-8"?>
 <plist version="1.0">
 <dict>
-    <key>name</key>
-    <string>customTheme</string>
-    <key>settings</key>
-    <array>
-        <!-- General Colors -->
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#0F1419</string> <!-- Background (base00) -->
-                <key>foreground</key>
-                <string>#E6E1CF</string> <!-- Foreground (base05) -->
-                <key>caret</key>
-                <string>#F3F4F5</string> <!-- Caret (base07) -->
-                <key>invisibles</key>
-                <string>#3E4B59</string> <!-- Invisibles (base03) -->
-                <key>lineHighlight</key>
-                <string>#272D38</string> <!-- Line highlight (base02) -->
-                <key>selection</key>
-                <string>#3E4B59</string> <!-- Selection (base03) -->
-            </dict>
-        </dict>
-        
-        <!-- Syntax-Specific Colors -->
-        <dict>
-            <key>scope</key>
-            <string>comment</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#BFBDB6</string> <!-- Comments (base04) -->
-            </dict>
-        </dict>
-        
-        <dict>
-            <key>scope</key>
-            <string>string</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#FFB454</string> <!-- Strings (base0A) -->
-            </dict>
-        </dict>
+	<key>name</key>
+	<string>customTheme</string>
+	<key>settings</key>
+	<array>
+		<!-- General Colors -->
+		<dict>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>${base00}</string>
+				<key>foreground</key>
+				<string>${base05}</string>
+				<key>caret</key>
+				<string>${base07}</string>
+				<key>invisibles</key>
+				<string>${base03}</string>
+				<key>lineHighlight</key>
+				<string>${base02}</string>
+				<key>selection</key>
+				<string>${base03}</string>
+			</dict>
+		</dict>
+		
+		<!-- Syntax-Specific Colors -->
+		<dict>
+			<key>scope</key>
+			<string>comment</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base04}</string>
+			</dict>
+		</dict>
+		
+		<dict>
+			<key>scope</key>
+			<string>string</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0A}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>constant.numeric</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#FF8F40</string> <!-- Numbers (base09) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>constant.numeric</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base09}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>variable</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F07178</string> <!-- Variables (base08) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>variable</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base08}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>keyword</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#59C2FF</string> <!-- Keywords (base0D) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>keyword</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0D}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>support.function</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#D2A6FF</string> <!-- Functions (base0E) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>support.function</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0E}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>constant.language</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#B8CC52</string> <!-- Constants (base0B) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>constant.language</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0B}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>entity.name.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#95E6CB</string> <!-- Tags (base0C) -->
-            </dict>
-        </dict>
+		<dict>
+			<key>scope</key>
+			<string>entity.name.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0C}</string>
+			</dict>
+		</dict>
 
-        <dict>
-            <key>scope</key>
-            <string>invalid</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#E6B673</string> <!-- Invalid (base0F) -->
-            </dict>
-        </dict>
-    </array>
+		<dict>
+			<key>scope</key>
+			<string>invalid</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>${base0F}</string>
+			</dict>
+		</dict>
+	</array>
 </dict>
 </plist>
 ''
diff --git a/modules/tools/viewer/default.nix b/modules/tools/viewer/default.nix
index dde782b..7784a99 100644
--- a/modules/tools/viewer/default.nix
+++ b/modules/tools/viewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ ... }:
 
 {
 	imports = [