8 files changed, 26 insertions, 19 deletions
diff --git a/modules/tools/bottom/default.nix b/modules/tools/bottom/default.nix
index 5f4f438..c307047 100644
--- a/modules/tools/bottom/default.nix
+++ b/modules/tools/bottom/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
 	options.tools.bottom = {
diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix
index fc90cef..dc563ea 100644
--- a/modules/tools/git/default.nix
+++ b/modules/tools/git/default.nix
@@ -5,11 +5,11 @@
 		enable = lib.mkEnableOption "Enables git.";
 		username = lib.mkOption {
 			type = lib.types.str;
-			description = "Github username.";
+			description = "Git username.";
 		};
 		email = lib.mkOption {
 			type = lib.types.str;
-			description = "Github email.";
+			description = "Git email.";
 		};
 	};
 
diff --git a/modules/tools/kitty/default.nix b/modules/tools/kitty/default.nix
index fa7b727..f5f7ec8 100644
--- a/modules/tools/kitty/default.nix
+++ b/modules/tools/kitty/default.nix
@@ -22,16 +22,16 @@
 				background = base00;
 				foreground = base05;
 
-				color0  = base00;
-				color1  = base08;
-				color2  = base0B;
-				color3  = base0A;
-				color4  = base0D;
-				color5  = base0E;
-				color6  = base0C;
-				color7  = base05;
-				color8  = base03;
-				color9  = base09;
+				color0 = base00;
+				color1 = base08;
+				color2 = base0B;
+				color3 = base0A;
+				color4 = base0D;
+				color5 = base0E;
+				color6 = base0C;
+				color7 = base05;
+				color8 = base03;
+				color9 = base09;
 				color10 = base0B;
 				color11 = base0A;
 				color12 = base0D;
diff --git a/modules/tools/librewolf/default.nix b/modules/tools/librewolf/default.nix
index 39f790c..bb6bcfd 100644
--- a/modules/tools/librewolf/default.nix
+++ b/modules/tools/librewolf/default.nix
@@ -17,15 +17,18 @@
 				isDefault = true;
 				settings = {
 					"extensions.autoDisableScopes" = 0;
-					"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; # Use default dark theme until Black gets installed
+					# Use default dark theme until Black gets installed
+					"extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
 					"sidebar.verticalTabs" = true;
 					"sidebar.visibility" = "always-show";
 					"sidebar.verticalTabs.dragToPinPromo.dismissed" = true;
 					"layout.css.devPixelsPerPx" = 1.1;
-					"layout.css.prefers-color-scheme.content-override" = 0; # Dark
+					# Dark
+					"layout.css.prefers-color-scheme.content-override" = 0;
 					"browser.toolbars.bookmarks.visibility" = "newtab";
+					# Tridactyl
 					"browser.startup.homepage"
-						= "moz-extension://8cb32547-41c0-4839-bec4-a4c08b4d267b/static/newtab.html"; # Tridactyl
+						= "moz-extension://8cb32547-41c0-4839-bec4-a4c08b4d267b/static/newtab.html";
 					"browser.startup.page" = 2;
 					"sidebar.expandOnHover" = false;
 					"sidebar.animation.enabled" = false;
diff --git a/modules/tools/nixvim/plugins/treesitter.nix b/modules/tools/nixvim/plugins/treesitter.nix
index 9e2ec1d..f13c84e 100644
--- a/modules/tools/nixvim/plugins/treesitter.nix
+++ b/modules/tools/nixvim/plugins/treesitter.nix
@@ -3,7 +3,9 @@
 {
 	config.programs.nixvim.plugins.treesitter = lib.mkIf config.tools.nixvim.enable {
 		enable = true;
-		folding = true;
+		folding = {
+			enable = true;
+		};
 		settings = {
 			highlight = { enable = true; };
 			indent = { enable = true; };
diff --git a/modules/tools/rofi/default.nix b/modules/tools/rofi/default.nix
index 7dc0f12..78c1614 100644
--- a/modules/tools/rofi/default.nix
+++ b/modules/tools/rofi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 
 {
 	options.tools.rofi = {
diff --git a/modules/tools/tmux/default.nix b/modules/tools/tmux/default.nix
index c72696f..8e15690 100644
--- a/modules/tools/tmux/default.nix
+++ b/modules/tools/tmux/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
 	options.tools.tmux = {
diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix
index e508509..ac147e3 100644
--- a/modules/tools/zsh/default.nix
+++ b/modules/tools/zsh/default.nix
@@ -17,5 +17,7 @@ else ""}
 ${builtins.readFile ./zshrc}
 			'';
 		};
+
+		home.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh";
 	};
 }