From 85f0b82334a67a91a4a1e724446d40d7ed9929f5 Mon Sep 17 00:00:00 2001 From: smayzy Date: Mon, 21 Jul 2025 14:40:21 +0200 Subject: [PATCH] mv calibre to modules --- hosts/common/common.nix | 1 - modules/nix/default.nix | 1 + modules/nix/ebook/calibre.nix | 15 +++++++++++++++ modules/nix/ebook/default.nix | 6 ++++++ modules/nix/groups/desktop.nix | 1 + modules/nix/groups/laptop.nix | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 modules/nix/ebook/calibre.nix create mode 100644 modules/nix/ebook/default.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index 2eb5cbf..b459639 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -18,7 +18,6 @@ environment.systemPackages = with pkgs; [ home-manager - calibre tor tshark freecad-wayland diff --git a/modules/nix/default.nix b/modules/nix/default.nix index e98b634..d325c51 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -19,6 +19,7 @@ ./utilities ./flatpak ./ide + ./ebook ]; # Timzone and locales (same for all machines so I put it here) diff --git a/modules/nix/ebook/calibre.nix b/modules/nix/ebook/calibre.nix new file mode 100644 index 0000000..2437456 --- /dev/null +++ b/modules/nix/ebook/calibre.nix @@ -0,0 +1,15 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.calibre.enable = mkOption { + type = types.bool; + default = false; + description = "enable calibre"; + }; + + config = mkIf config.smayzy.calibre.enable { + environment.systemPackages = with pkgs; [ calibre ]; + }; +} diff --git a/modules/nix/ebook/default.nix b/modules/nix/ebook/default.nix new file mode 100644 index 0000000..1fd4b3b --- /dev/null +++ b/modules/nix/ebook/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./calibre.nix + ]; +} diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index d58369c..a5b6059 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -40,6 +40,7 @@ in gaming.enable = true; }; arduino.enable = true; + calibre.enable = true; }; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index 175d5f3..e6232b6 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -38,6 +38,7 @@ in media.enable = true; }; arduino.enable = true; + calibre.enable = true; }; services.logind.lidSwitch = "ignore"; };