From 4b8b1718a451ec2dcb4edbf3838cb4dbc0b57b19 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 20 Mar 2024 10:43:35 -0500 Subject: [PATCH] remove noop functions and add devshell --- lib/default.nix | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 944944f..9d37bd3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -15,15 +15,7 @@ in rec { forAllSystems = f: genAttrs supportedSystems (system: f nixpkgs.legacyPackages.${system}); - buildOizys = _: - forAllSystems ( - pkgs: let - pkg = pkgs.callPackage ../oizys {}; - in { - oizys = pkg; - default = pkg; - } - ); + nixosModules = listToAttrs (findModulesList ../modules); mkSystem = hostname: nixosSystem { @@ -39,13 +31,29 @@ in rec { specialArgs = {inherit inputs lib self;}; }; - mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir); - findModules = _: listToAttrs (findModulesList ../modules); + + oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts); + oizysPkg = forAllSystems ( + pkgs: let + pkg = pkgs.callPackage ../oizys {}; + in { + oizys = pkg; + default = pkg; + } + ); + devShells = forAllSystems ( + pkgs: { + default = pkgs.mkShell { + packages = with pkgs; [git deadnix]; + }; + } + ); oizysFlake = _: { - nixosModules = findModules {}; - nixosConfigurations = mapHosts ../hosts; - packages = buildOizys {}; + nixosModules = nixosModules; + nixosConfigurations = oizysHosts; + packages = oizysPkg; + devShells = devShells; formatter = forAllSystems (pkgs: pkgs.alejandra); }; }