From cd25fdf37c0165e9a04e6b7a0311bd11ec3e0518 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Mon, 30 Dec 2019 18:00:09 -0700 Subject: [PATCH] flake: move modules to outputs --- flake.nix | 2 ++ hosts/default.nix | 6 +++++- modules/default.nix | 3 +++ profiles/misc/torrent.nix | 2 -- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 modules/default.nix diff --git a/flake.nix b/flake.nix index 2c13346..0384efa 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ pkgs = import ./pkgs; in [ pkgs ]; + + nixosModules = import ./modules; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 461611a..b10d4ca 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,6 +6,10 @@ let recImport ; + inherit (builtins) + attrValues + ; + config = self: nixpkgs.lib.nixosSystem rec { @@ -27,7 +31,7 @@ let local = import "${toString ./.}/${self}.nix"; in - [ + attrValues flake.nixosModules ++ [ core global local diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..cdd258c --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,3 @@ +{ + qbittorrent-nox = import ./services/torrent/qbittorrent.nix; +} diff --git a/profiles/misc/torrent.nix b/profiles/misc/torrent.nix index 8482dd8..3337af2 100644 --- a/profiles/misc/torrent.nix +++ b/profiles/misc/torrent.nix @@ -4,8 +4,6 @@ let inherit (lib) mkAfter; in { - imports = [ ../../modules/services/torrent/qbittorrent.nix ]; - services.qbittorrent = { enable = true; group = "media";