Using unstable branches for nixpkgs and home manager.

5 files changed, 4 insertions, 147 deletions

diff --git a/modules/tools/bat/default.nix b/modules/tools/bat/default.nix
deleted file mode 100644
index d459042..0000000
--- a/modules/tools/bat/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-	options.tools.bat = {
-		enable = lib.mkEnableOption "Enables bat.";
-	};
-
-	config = lib.mkIf config.tools.bat.enable {
-		programs.bat.enable = true;
-		programs.bat.config = {
-			tabs = "4";
-			theme = "custom-theme";
-		};
-		# shell.alias."cat" = "${pkgs.bat}/bin/bat -pp";
-		# shell.alias."less" = "${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.mustache.tmTheme;
-			};
-	};
-}
diff --git a/modules/tools/bat/theme.mustache.tmTheme b/modules/tools/bat/theme.mustache.tmTheme
deleted file mode 100644
index 844b80d..0000000
--- a/modules/tools/bat/theme.mustache.tmTheme
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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>#{{base00-hex}}</string>
-				<key>foreground</key>
-				<string>#{{base05-hex}}</string>
-				<key>caret</key>
-				<string>#{{base07-hex}}</string>
-				<key>invisibles</key>
-				<string>#{{base03-hex}}</string>
-				<key>lineHighlight</key>
-				<string>#{{base02-hex}}</string>
-				<key>selection</key>
-				<string>#{{base03-hex}}</string>
-			</dict>
-		</dict>
-		
-		<!-- Syntax-Specific Colors -->
-		<dict>
-			<key>scope</key>
-			<string>comment</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base04-hex}}</string>
-			</dict>
-		</dict>
-		
-		<dict>
-			<key>scope</key>
-			<string>string</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0A-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>constant.numeric</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base09-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>variable</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base08-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>keyword</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0D-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>support.function</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0E-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>constant.language</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0B-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>entity.name.tag</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0C-hex}}</string>
-			</dict>
-		</dict>
-
-		<dict>
-			<key>scope</key>
-			<string>invalid</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#{{base0F-hex}}</string>
-			</dict>
-		</dict>
-	</array>
-</dict>
-</plist>
-
diff --git a/modules/tools/default.nix b/modules/tools/default.nix
index f288dd3..243d2f2 100644
--- a/modules/tools/default.nix
+++ b/modules/tools/default.nix
@@ -2,7 +2,6 @@
 
 {
 	imports = [
-		./bat
 		./bluetui
 		./bottom
 		./brave
diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix
index d1dee35..fc90cef 100644
--- a/modules/tools/git/default.nix
+++ b/modules/tools/git/default.nix
@@ -16,9 +16,9 @@
 	config = lib.mkIf config.tools.git.enable {
 		programs.git = {
 			enable = true;
-			userName = config.tools.git.username;
-			userEmail = config.tools.git.email;
-			extraConfig = {
+			settings = {
+				user.name = config.tools.git.username;
+				user.email = config.tools.git.email;
 				credential.helper = "store --file ${config.xdg.cacheHome}/git/credential";
 				core.askPass = "";
 			};
diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix
index 0011da4..e508509 100644
--- a/modules/tools/zsh/default.nix
+++ b/modules/tools/zsh/default.nix
@@ -8,7 +8,7 @@
 	config = lib.mkIf config.tools.zsh.enable {
 		programs.zsh = {
 			enable = true;
-			dotDir = ".config/zsh";
+			dotDir = "${config.xdg.configHome}/zsh";
 			history.path = "${config.xdg.cacheHome}/zsh/history";
 			initContent = ''
 ${if config.tools.fzf.enable then