From 331ae65d69060bccf72340ff9b4de8b1ee7858ff Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 25 Apr 2023 16:27:54 +0100
Subject: [PATCH] Move bat into env, required by git (for delta)

---
 nixos/home/collections/work/default.nix | 10 +++++++++-
 nixos/home/env/bat.nix                  | 19 +++++++++++++++++++
 nixos/home/env/default.nix              | 13 -------------
 nixos/home/git/default.nix              |  8 +++++++-
 nixos/home/tui/common.nix               | 16 ----------------
 nixos/home/tui/default.nix              |  1 +
 6 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 nixos/home/env/bat.nix
 delete mode 100644 nixos/home/env/default.nix

diff --git a/nixos/home/collections/work/default.nix b/nixos/home/collections/work/default.nix
index 031b5ff4..1a12af35 100644
--- a/nixos/home/collections/work/default.nix
+++ b/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
 
diff --git a/nixos/home/env/bat.nix b/nixos/home/env/bat.nix
new file mode 100644
index 00000000..565af861
--- /dev/null
+++ b/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");
+    };
+  };
+}
diff --git a/nixos/home/env/default.nix b/nixos/home/env/default.nix
deleted file mode 100644
index 25eab0aa..00000000
--- a/nixos/home/env/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./fonts
-    ./shell
-    ./direnv.nix
-    ./keychain.nix
-    ./nixpkgs.nix
-    ./qemu.nix
-    ./ssh.nix
-    ./starship.nix
-  ];
-}
diff --git a/nixos/home/git/default.nix b/nixos/home/git/default.nix
index 8b766bda..19db9dc9 100644
--- a/nixos/home/git/default.nix
+++ b/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;
diff --git a/nixos/home/tui/common.nix b/nixos/home/tui/common.nix
index e823c009..e70c1427 100644
--- a/nixos/home/tui/common.nix
+++ b/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
diff --git a/nixos/home/tui/default.nix b/nixos/home/tui/default.nix
index 017e16aa..945ea583 100644
--- a/nixos/home/tui/default.nix
+++ b/nixos/home/tui/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./common.nix
     ./lazygit.nix
     ./neovim.nix
   ];