Added impala and bluetui for wifi and bluetooth management.

Some minor code refactoring.

17 files changed, 158 insertions, 138 deletions

diff --git a/modules/desktop/polybar/module/xwindow.nix b/modules/desktop/polybar/module/xwindow.nix
index 833899e..58e6cd5 100644
--- a/modules/desktop/polybar/module/xwindow.nix
+++ b/modules/desktop/polybar/module/xwindow.nix
@@ -3,5 +3,5 @@
 with config.scheme.withHashtag;
 {
 	type = "internal/xwindow";
-	label = "%title:0:30:...%";
+	label = "%title:0:40:...%";
 }
diff --git a/modules/tools/acpi/default.nix b/modules/tools/acpi/default.nix
deleted file mode 100644
index 2097620..0000000
--- a/modules/tools/acpi/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-	options.tools.acpi = {
-		enable = lib.mkEnableOption "Enables acpi.";
-	};
-
-	config = lib.mkIf config.tools.acpi.enable {
-		home.packages = [
-			pkgs.acpi
-		];
-	};
-}
diff --git a/modules/tools/bluetui/default.nix b/modules/tools/bluetui/default.nix
new file mode 100644
index 0000000..2a7847d
--- /dev/null
+++ b/modules/tools/bluetui/default.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+	options.tools.bluetui = {
+		enable = lib.mkEnableOption "Enables bluetui.";
+	};
+
+	config = lib.mkIf config.tools.bluetui.enable {
+		home.packages = with pkgs; [
+			bluetui
+		];
+	};
+}
diff --git a/modules/tools/bottom/default.nix b/modules/tools/bottom/default.nix
index 2a7cb01..5f4f438 100644
--- a/modules/tools/bottom/default.nix
+++ b/modules/tools/bottom/default.nix
@@ -6,8 +6,6 @@
 	};
 
 	config = lib.mkIf config.tools.bottom.enable {
-		home.packages = with pkgs; [
-			bottom
-		];
+		programs.bottom.enable = true;
 	};
 }
diff --git a/modules/tools/brightnessctl/default.nix b/modules/tools/brightnessctl/default.nix
index f4aa488..a35e3e4 100644
--- a/modules/tools/brightnessctl/default.nix
+++ b/modules/tools/brightnessctl/default.nix
@@ -6,8 +6,8 @@
 	};
 
 	config = lib.mkIf config.tools.brightnessctl.enable {
-		home.packages = [
-			pkgs.brightnessctl
+		home.packages = with pkgs; [
+			brightnessctl
 		];
 	};
 }
diff --git a/modules/tools/default.nix b/modules/tools/default.nix
index f40f3f3..f288dd3 100644
--- a/modules/tools/default.nix
+++ b/modules/tools/default.nix
@@ -2,8 +2,8 @@
 
 {
 	imports = [
-		./acpi
 		./bat
+		./bluetui
 		./bottom
 		./brave
 		./brightnessctl
@@ -11,6 +11,7 @@
 		./fzf
 		./git
 		./htop
+		./impala
 		./kitty
 		./lsd
 		./neofetch
diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix
index 798db39..d1dee35 100644
--- a/modules/tools/git/default.nix
+++ b/modules/tools/git/default.nix
@@ -14,12 +14,14 @@
 	};
 
 	config = lib.mkIf config.tools.git.enable {
-		programs.git.enable = true;
-		programs.git.userName = config.tools.git.username;
-		programs.git.userEmail = config.tools.git.email;
-		programs.git.extraConfig = {
-			credential.helper = "store --file ${config.xdg.cacheHome}/git/credential";
-			core.askPass = "";
+		programs.git = {
+			enable = true;
+			userName = config.tools.git.username;
+			userEmail = config.tools.git.email;
+			extraConfig = {
+				credential.helper = "store --file ${config.xdg.cacheHome}/git/credential";
+				core.askPass = "";
+			};
 		};
 
 		# The base directory of the credential file must exist
diff --git a/modules/tools/htop/default.nix b/modules/tools/htop/default.nix
index d4037e6..f418054 100644
--- a/modules/tools/htop/default.nix
+++ b/modules/tools/htop/default.nix
@@ -6,7 +6,9 @@
 	};
 
 	config = lib.mkIf config.tools.htop.enable {
-		programs.htop.enable = true;
-		programs.htop.package = pkgs.htop-vim;
+		programs.htop = {
+			enable = true;
+			package = pkgs.htop-vim;
+		};
 	};
 }
diff --git a/modules/tools/impala/default.nix b/modules/tools/impala/default.nix
new file mode 100644
index 0000000..d973fac
--- /dev/null
+++ b/modules/tools/impala/default.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+	options.tools.impala = {
+		enable = lib.mkEnableOption "Enables impala.";
+	};
+
+	config = lib.mkIf config.tools.impala.enable {
+		home.packages = with pkgs; [
+			impala
+		];
+	};
+}
diff --git a/modules/tools/kitty/default.nix b/modules/tools/kitty/default.nix
index a53bbb4..fa7b727 100644
--- a/modules/tools/kitty/default.nix
+++ b/modules/tools/kitty/default.nix
@@ -6,44 +6,46 @@
 	};
 
 	config = lib.mkIf config.tools.kitty.enable {
-		programs.kitty.enable = true;
-		programs.kitty.settings = with config.scheme.withHashtag; {
-			window_padding_width = 10;
-			font_size = config.fonts.size;
-			font_family = config.fonts.normal;
-			filter_notification = "all";
-			update_check_interval = 0; # disable notifications
-			scrollback_indicator_opacity = "0.5";
+		programs.kitty = {
+			enable = true;
+			settings = with config.scheme.withHashtag; {
+				window_padding_width = 10;
+				font_size = config.fonts.size;
+				font_family = config.fonts.normal;
+				filter_notification = "all";
+				update_check_interval = 0;
+				scrollback_indicator_opacity = "0.5";
 
-			dynamic_background_opacity = false;
-			enable_audio_bell = false;
+				dynamic_background_opacity = false;
+				enable_audio_bell = false;
 
-			background = base00;
-			foreground = base05;
-			text_composition_strategy = "legacy";
+				background = base00;
+				foreground = base05;
 
-			color0 = base00; # Black
-			color8 = base00; # Black
-			color1 = base08; # Red
-			color9 = base08; # Red
-			color2 = base0B; # Green
-			color10 = base0B; # Green
-			color3 = base0A; # Yellow
-			color11 = base0A; # Yellow
-			color4 = base0D; # Blue
-			color12 = base0D; # Blue
-			color5 = base0E; # Magenta
-			color13 = base0E; # Magenta
-			color6 = base0C; # Cyan
-			color14 = base0C; # Cyan
-			color7 = base05; # White
-			color15 = base05; # White
+				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;
+				color13 = base0E;
+				color14 = base0F;
+				color15 = base07;
 
-			selection_background = base03;
-			selection_foreground = base00;
+				selection_background = base05;
+				selection_foreground = base00;
 
-			allow_remote_control = "yes";
-			listen_on = "unix:/tmp/kitty";
+				allow_remote_control = "yes";
+				listen_on = "unix:/tmp/kitty";
+				shell = lib.mkIf config.tools.zsh.enable "zsh";
+			};
 		};
 	};
 }
diff --git a/modules/tools/lsd/default.nix b/modules/tools/lsd/default.nix
index feb1481..31a69cc 100644
--- a/modules/tools/lsd/default.nix
+++ b/modules/tools/lsd/default.nix
@@ -6,7 +6,9 @@
 	};
 
 	config = lib.mkIf config.tools.lsd.enable {
-		programs.lsd.enable = true;
-		programs.lsd.settings.icons.separator = "  ";
+		programs.lsd = {
+			enable = true;
+			settings.icons.separator = "  ";
+		};
 	};
 }
diff --git a/modules/tools/neovim/default.nix b/modules/tools/neovim/default.nix
index 2c0b7aa..bc57f2f 100644
--- a/modules/tools/neovim/default.nix
+++ b/modules/tools/neovim/default.nix
@@ -13,24 +13,23 @@
 		};
 	};
 
-	config =
-	let
+	config = let
 		plugins = import ./plugins { inherit config pkgs lib; };
 	in lib.mkIf config.tools.neovim.enable {
-		programs.neovim.enable = true;
-		programs.neovim.viAlias = true;
-		programs.neovim.vimAlias = true;
-		programs.neovim.vimdiffAlias = true;
-		programs.neovim.defaultEditor = true;
-
-		home.packages = plugins.requirements;
-
-		programs.neovim.extraLuaConfig =
+		programs.neovim = {
+			enable = true;
+			viAlias = true;
+			vimAlias = true;
+			vimdiffAlias = true;
+			defaultEditor = true;
+			plugins = plugins.list;
+			extraLuaConfig =
 	''
 ${import ./config}
 ${plugins.configuration}
 	'';
+		};
 
-		programs.neovim.plugins = plugins.list;
+		home.packages = plugins.requirements;
 	};
 }
diff --git a/modules/tools/pamixer/default.nix b/modules/tools/pamixer/default.nix
index f182099..d224ed2 100644
--- a/modules/tools/pamixer/default.nix
+++ b/modules/tools/pamixer/default.nix
@@ -6,8 +6,8 @@
 	};
 
 	config = lib.mkIf config.tools.pamixer.enable {
-		home.packages = [
-			pkgs.pamixer
+		home.packages = with pkgs; [
+			pamixer
 		];
 	};
 }
diff --git a/modules/tools/playerctl/default.nix b/modules/tools/playerctl/default.nix
index 1453bc2..8b4487c 100644
--- a/modules/tools/playerctl/default.nix
+++ b/modules/tools/playerctl/default.nix
@@ -6,8 +6,8 @@
 	};
 
 	config = lib.mkIf config.tools.playerctl.enable {
-		home.packages = [
-			pkgs.playerctl
+		home.packages = with pkgs; [
+			playerctl
 		];
 	};
 }
diff --git a/modules/tools/rofi/default.nix b/modules/tools/rofi/default.nix
index 7efbf5f..7dc0f12 100644
--- a/modules/tools/rofi/default.nix
+++ b/modules/tools/rofi/default.nix
@@ -6,67 +6,69 @@
 	};
 
 	config = lib.mkIf config.tools.rofi.enable {
-		programs.rofi.enable = true;
-		programs.rofi.font = "${config.fonts.normal} ${toString config.fonts.size}";
-		programs.rofi.theme =  with config.scheme.withHashtag; let
-			inherit (config.lib.formats.rasi) mkLiteral;
-		in {
-			"*" = {
-				border = 1;
-				margin = 0;
-				padding = 0;
-				spacing = 0;
+		programs.rofi = {
+			enable = true;
+			font = "${config.fonts.normal} ${toString config.fonts.size}";
+			theme =  with config.scheme.withHashtag; let
+				inherit (config.lib.formats.rasi) mkLiteral;
+			in {
+				"*" = {
+					border = 1;
+					margin = 0;
+					padding = 0;
+					spacing = 0;
 
-				bg = mkLiteral base00;
-				bg-alt = mkLiteral base01;
-				fg = mkLiteral base07;
-				fg-alt = mkLiteral base03;
-				background-color = mkLiteral "@bg";
-				text-color = mkLiteral "@fg";
-			};
+					bg = mkLiteral base00;
+					bg-alt = mkLiteral base01;
+					fg = mkLiteral base07;
+					fg-alt = mkLiteral base03;
+					background-color = mkLiteral "@bg";
+					text-color = mkLiteral "@fg";
+				};
 
-			window = {
-				border-color = mkLiteral base03;
-			};
+				window = {
+					border-color = mkLiteral base03;
+				};
 
-			mainbox = {
-				children = map mkLiteral [ "inputbar" "listview" ];
-			};
+				mainbox = {
+					children = map mkLiteral [ "inputbar" "listview" ];
+				};
 
-			inputbar = {
-				background-color = mkLiteral "@bg-alt";
-				children = map mkLiteral [ "prompt" "entry" ];
-			};
+				inputbar = {
+					background-color = mkLiteral "@bg-alt";
+					children = map mkLiteral [ "prompt" "entry" ];
+				};
 
-			entry = {
-				background-color = mkLiteral "inherit";
-				padding = mkLiteral "12px 3px";
-			};
+				entry = {
+					background-color = mkLiteral "inherit";
+					padding = mkLiteral "12px 3px";
+				};
 
-			prompt = {
-				background-color = mkLiteral "inherit";
-				padding = mkLiteral "12px";
-			};
+				prompt = {
+					background-color = mkLiteral "inherit";
+					padding = mkLiteral "12px";
+				};
 
-			listview = {
-				lines = 8;
-			};
+				listview = {
+					lines = 8;
+				};
 
-			element = {
-				children = map mkLiteral [ "element-text" ];
-			};
+				element = {
+					children = map mkLiteral [ "element-text" ];
+				};
 
-			element-icon = {
-				padding = mkLiteral "10px 10px";
-			};
+				element-icon = {
+					padding = mkLiteral "10px 10px";
+				};
 
-			element-text = {
-				padding = mkLiteral "10px 10px";
-				text-color = mkLiteral "@fg-alt";
-			};
+				element-text = {
+					padding = mkLiteral "10px 10px";
+					text-color = mkLiteral "@fg-alt";
+				};
 
-			"element-text selected" = {
-				text-color = mkLiteral "@fg";
+				"element-text selected" = {
+					text-color = mkLiteral "@fg";
+				};
 			};
 		};
 	};
diff --git a/modules/tools/tmux/default.nix b/modules/tools/tmux/default.nix
index 7559f1a..c72696f 100644
--- a/modules/tools/tmux/default.nix
+++ b/modules/tools/tmux/default.nix
@@ -6,8 +6,6 @@
 	};
 
 	config = lib.mkIf config.tools.tmux.enable {
-		home.packages = with pkgs; [
-			tmux
-		];
+		programs.tmux.enable = true;
 	};
 }
diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix
index 6c1f343..0011da4 100644
--- a/modules/tools/zsh/default.nix
+++ b/modules/tools/zsh/default.nix
@@ -6,15 +6,16 @@
 	};
 
 	config = lib.mkIf config.tools.zsh.enable {
-		programs.zsh.enable = true;
-		programs.zsh.dotDir = ".config/zsh";
-		programs.zsh.history.path = "${config.xdg.cacheHome}/zsh/history";
-		programs.zsh.initContent = ''
+		programs.zsh = {
+			enable = true;
+			dotDir = ".config/zsh";
+			history.path = "${config.xdg.cacheHome}/zsh/history";
+			initContent = ''
 ${if config.tools.fzf.enable then
 	"eval \"$(fzf --zsh)\""
 else ""}
 ${builtins.readFile ./zshrc}
-		'';
-		programs.kitty.settings.shell = lib.mkIf config.tools.kitty.enable "zsh";
+			'';
+		};
 	};
 }