bat: move to module

4 files changed, 23 insertions, 12 deletions

diff --git a/hm/bat/default.nix b/hm/bat/default.nix
deleted file mode 100644
index d7d073c..0000000
--- a/hm/bat/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  programs.bat = {
-    enable = true;
-    extraPackages = with pkgs.bat-extras; [
-      batdiff
-      batman
-      batgrep
-      batwatch
-    ];
-  };
-}
diff --git a/hm/default.nix b/hm/default.nix
index ffb959e..c85da70 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -1,7 +1,6 @@
 {nixvim, ...}: {
   imports = [
     ../modules/hm
-    ./bat
     ./direnv
     ./etesync-dav
     #./eww
@@ -35,6 +34,7 @@
   };
 
   sils = {
+    bat.enable = true;
     firefox.enable = true;
     jameica.enable = true;
     mail.enable = true;
diff --git a/modules/hm/sils/bat.nix b/modules/hm/sils/bat.nix
new file mode 100644
index 0000000..5f7b967
--- /dev/null
+++ b/modules/hm/sils/bat.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.sils.bat;
+in {
+  options.sils.bat.enable = lib.mkEnableOption "bat";
+  config = lib.mkIf cfg.enable {
+    programs.bat = {
+      enable = true;
+      extraPackages = with pkgs.bat-extras; [
+        batdiff
+        batman
+        batgrep
+        batwatch
+      ];
+    };
+  };
+}
diff --git a/modules/hm/sils/default.nix b/modules/hm/sils/default.nix
index c298715..fc0893f 100644
--- a/modules/hm/sils/default.nix
+++ b/modules/hm/sils/default.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
+    ./bat.nix
     ./firefox
     ./jameica.nix
     ./mail.nix