diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 5a9daf50..7c33081e 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -31,6 +31,7 @@ # Modules modules = { + extra.enable = true; desktop = { enable = true; gnome.enable = true; @@ -46,7 +47,6 @@ pc.enable = true; }; programs = { - beancount.enable = true; borg.enable = true; chezmoi.apply = true; kitty.enable = true; diff --git a/provision/modules/default.nix b/provision/modules/default.nix index ffdbcc6e..c2f34063 100644 --- a/provision/modules/default.nix +++ b/provision/modules/default.nix @@ -4,6 +4,7 @@ ./base ./desktop ./devel + ./extra ./gaming ./programs ./services diff --git a/provision/modules/extra/default.nix b/provision/modules/extra/default.nix new file mode 100644 index 00000000..d0cc77f6 --- /dev/null +++ b/provision/modules/extra/default.nix @@ -0,0 +1,7 @@ +{ lib, ... }: +{ + imports = [ + ../programs/beancount.nix + ]; + options.modules.extra.enable = lib.mkEnableOption "extra"; +} diff --git a/provision/modules/programs/beancount.nix b/provision/modules/programs/beancount.nix index 818af851..504ed13f 100644 --- a/provision/modules/programs/beancount.nix +++ b/provision/modules/programs/beancount.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, user, ... }: -let cfg = config.modules.programs.beancount; +let cfg = config.modules.extra; in { - options.modules.programs.beancount.enable = lib.mkEnableOption "beancount"; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ fava # Web interface for the double-entry bookkeeping software Beancount diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix index fa3193d4..8059b872 100644 --- a/provision/modules/programs/default.nix +++ b/provision/modules/programs/default.nix @@ -2,7 +2,6 @@ { imports = [ ./appgate-sdp.nix - ./beancount.nix ./borg.nix ./chrome.nix ./firefox.nix