Move bat into env, required by git (for delta)

nixos/home/collections/work/default.nix

@@ -3,7 +3,15 @@
   imports = [
     ../../desktop
 
-    ../../env
+    ../../env/fonts/firacode.nix
+    ../../env/shell/bash.nix
+    ../../env/shell/fish.nix
+    ../../env/bat.nix
+    ../../env/direnv.nix
+    ../../env/keychain.nix
+    ../../env/nixpkgs.nix
+    ../../env/ssh.nix
+    ../../env/starship.nix
 
     ../../git/work
 

nixos/home/env/bat.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+  imports = [ ../env/fonts];
+  programs.bat = {
+    enable = true;
+    config = {
+      theme = "Catppuccin-macchiato";
+    };
+    themes = {
+      Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
+        {
+          owner = "catppuccin";
+          repo = "bat";
+          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+          sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+        } + "/Catppuccin-macchiato.tmTheme");
+    };
+  };
+}

nixos/home/env/default.nix

@@ -1,13 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./fonts
-    ./shell
-    ./direnv.nix
-    ./keychain.nix
-    ./nixpkgs.nix
-    ./qemu.nix
-    ./ssh.nix
-    ./starship.nix
-  ];
-}

nixos/home/git/default.nix

@@ -1,13 +1,19 @@
 { ... }:
 {
   imports = [
+    ../env/bat.nix
     ../env/ssh.nix
     ../env/shell
   ];
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
-    delta.enable = true;
+    delta = {
+      enable = true;
+      options = {
+        syntax-theme = "Catppuccin-macchiato";
+      };
+    };
     extraConfig = {
       pull = {
         rebase = false;

nixos/home/tui/common.nix

@@ -1,22 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../env/fonts];
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "Catppuccin-macchiato";
-    };
-    themes = {
-      Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
-        {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-          sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        } + "/Catppuccin-macchiato.tmTheme");
-    };
-  };
   home.packages = with pkgs; [
     file
     silver-searcher

nixos/home/tui/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./common.nix
     ./lazygit.nix
     ./neovim.nix
   ];