teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

modules: convert to list to match nixpkg sematics

Browse source
This commit is contained in:
Timothy DeHerrera 2020-01-04 16:08:49 -07:00
parent 0b131c0bf1
commit ae303b39fd
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -8,6 +8,9 @@
outputs = args@{ self, home, nixpkgs }: outputs = args@{ self, home, nixpkgs }:
let let
inherit (builtins) listToAttrs baseNameOf;
inherit (nixpkgs.lib) removeSuffix;
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = self.overlays; overlays = self.overlays;
@ -25,6 +28,15 @@
inherit (pkgs) sddm-chili dejavu_nerdfont purs; inherit (pkgs) sddm-chili dejavu_nerdfont purs;
}; };
nixosModules = (import ./modules) // { profiles = import ./profiles; }; nixosModules = let
moduleList = import ./modules;
modulesAttrs = listToAttrs (map (path: {
name = removeSuffix ".nix" (baseNameOf path);
value = import path;
}) moduleList);
profilesAttrs = { profiles = import ./profiles; };
in modulesAttrs // profilesAttrs;
}; };
} }

2
modules/default.nix
View file

@ -1 +1 @@
{ qbittorrent-nox = import ./services/torrent/qbittorrent.nix; } [ ./services/torrent/qbittorrent.nix ]