feat(home): Bat

homes/x86_64-linux/marley@nyx/default.nix

@@ -15,6 +15,7 @@ in
     };
     programs = {
       amfora = enabled;
+      bat = enabled;
       fish = enabled;
       journalctl = enabled;
       neo = enabled;

modules/home/programs/bat/default.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  config,
+  namespace,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkEnableModule enabled;
+
+  cfg = config.${namespace}.programs.bat;
+  inherit (config.${namespace}) theme;
+in
+{
+  options = mkEnableModule "programs.bat";
+
+  config = mkIf cfg.enable {
+    programs.bat = {
+      enable = true;
+
+      extraPackages = with pkgs.bat-extras; [
+        batdiff
+        batman
+      ];
+
+      "${theme.colors.base}" = enabled;
+
+      config = {
+        style = "auto";
+      };
+    };
+
+    home.sessionVariables = lib.mkIf config.programs.git.delta.enable {
+      BATDIFF_USE_DELTA = "true";
+    };
+
+    programs.fish = lib.mkIf config.programs.fish.enable {
+      functions = {
+        cat = {
+          wraps = "bat";
+          body = # fish
+            "bat $argv";
+        };
+
+        cath = {
+          wraps = "bat";
+          body = # fish
+            "bat --plain --language=help $argv";
+        };
+      };
+    };
+
+    home.shellAbbrs = {
+      B = {
+        position = "anywhere";
+        setCursor = true;
+        expansion = # fish
+          "% | bat";
+      };
+
+      "-h" = {
+        position = "anywhere";
+        expansion = # fish
+          "-h | cath";
+      };
+
+      "--help" = {
+        position = "anywhere";
+        expansion = # fish
+          "--help | cath";
+      };
+
+      help = {
+        position = "anywhere";
+        expansion = # fish
+          "help | cath";
+      };
+    };
+  };
+}

old/home/programs/bat.nix

@@ -1,69 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-{
-  programs.bat = {
-    enable = true;
-
-    extraPackages = with pkgs.bat-extras; [
-      batdiff
-      batman
-    ];
-
-    rose-pine.enable = true;
-
-    config = {
-      style = "auto";
-    };
-  };
-
-  home.sessionVariables = lib.mkIf config.home.preferXdgDirectories {
-    BATDIFF_USE_DELTA = "true";
-  };
-
-  programs.fish = lib.mkIf config.programs.fish.enable {
-    functions = {
-      cat = {
-        wraps = "bat";
-        body = # fish
-          "bat $argv";
-      };
-
-      cath = {
-        wraps = "bat";
-        body = # fish
-          "bat --plain --language=help $argv";
-      };
-    };
-
-    shellAbbrs = {
-      B = {
-        position = "anywhere";
-        setCursor = true;
-        expansion = # fish
-          "% | bat";
-      };
-
-      "-h" = {
-        position = "anywhere";
-        expansion = # fish
-          "-h | cath";
-      };
-
-      "--help" = {
-        position = "anywhere";
-        expansion = # fish
-          "--help | cath";
-      };
-
-      help = {
-        position = "anywhere";
-        expansion = # fish
-          "help | cath";
-      };
-    };
-  };
-}