From 960c950b43fb2a9c33af9a23e7569e30c00dabbe Mon Sep 17 00:00:00 2001 From: Silas Schöffel Date: Sun, 21 Apr 2024 17:54:18 +0200 Subject: bat: move to module --- hm/bat/default.nix | 11 ----------- hm/default.nix | 2 +- modules/hm/sils/bat.nix | 21 +++++++++++++++++++++ modules/hm/sils/default.nix | 1 + 4 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 hm/bat/default.nix create mode 100644 modules/hm/sils/bat.nix 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 -- cgit 1.4.1