5 files changed, 22 insertions, 10 deletions
diff --git a/modules/tools/editor/neovim/plugins/base16.lua b/modules/tools/editor/neovim/plugins/base16.lua
deleted file mode 100644
index 9843b76..0000000
--- a/modules/tools/editor/neovim/plugins/base16.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-vim.o.termguicolors = true;
-vim.opt.termguicolors = true;
-vim.o.background = "dark";
-vim.g.base16colorspace = 256
-vim.cmd.colorscheme("base16-scheme");
-vim.api.nvim_set_hl(0, "LineNr", { link = "Normal" }); -- disable the background of line numbers
diff --git a/modules/tools/editor/neovim/plugins/base16.mustache.lua b/modules/tools/editor/neovim/plugins/base16.mustache.lua
new file mode 100644
index 0000000..3c13fcc
--- /dev/null
+++ b/modules/tools/editor/neovim/plugins/base16.mustache.lua
@@ -0,0 +1,12 @@
+vim.o.termguicolors = true;
+vim.opt.termguicolors = true;
+vim.o.background = "dark";
+vim.g.base16colorspace = 256
+vim.cmd.colorscheme("base16-scheme");
+
+-- Overrides
+-- disable the background of line numbers
+vim.api.nvim_set_hl(0, "LineNr", { link = "Normal" });
+
+-- change the color of the pane separator
+vim.api.nvim_set_hl(0, "WinSeparator", { fg = "#{{base02-hex}}", bg = "None" });
diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix
index 2df4e4a..ace5379 100644
--- a/modules/tools/editor/neovim/plugins/default.nix
+++ b/modules/tools/editor/neovim/plugins/default.nix
@@ -4,6 +4,8 @@
 ${builtins.readFile ./comment.lua}
 ${builtins.readFile ./lualine.lua}
 ${import ./treesitter.nix { inherit config; }}
-${builtins.readFile ./base16.lua}
+${builtins.readFile (config.scheme {
+	template = builtins.readFile ./base16.mustache.lua;
+})}
 ${builtins.readFile ./nvim-tree.lua}
 ''
diff --git a/modules/tools/viewer/bat/default.nix b/modules/tools/viewer/bat/default.nix
index 73bdefd..ec68eb7 100644
--- a/modules/tools/viewer/bat/default.nix
+++ b/modules/tools/viewer/bat/default.nix
@@ -7,12 +7,16 @@
 
 	config = lib.mkIf config.tools.viewer.bat.enable {
 		programs.bat.enable = true;
-		programs.bat.config.theme = "custom-theme";
-		shell.alias."cbat" = "${pkgs.bat}/bin/bat -pp";
+		programs.bat.config = {
+			tabs = "4";
+			theme = "custom-theme";
+		};
+		shell.alias."bc" = "${pkgs.bat}/bin/bat -pp";
+		shell.alias."bp" = "${pkgs.bat}/bin/bat --paging always";
 		home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always";
 		xdg.configFile."bat/themes/custom-theme.tmTheme".source
 			= config.scheme {
-				template = builtins.readFile ./theme.tmTheme.mustache;
+				template = builtins.readFile ./theme.mustache.tmTheme;
 			};
 	};
 }
diff --git a/modules/tools/viewer/bat/theme.tmTheme.mustache b/modules/tools/viewer/bat/theme.mustache.tmTheme
index 844b80d..844b80d 100644
--- a/modules/tools/viewer/bat/theme.tmTheme.mustache
+++ b/modules/tools/viewer/bat/theme.mustache.tmTheme