diff --git a/flake.nix b/flake.nix index 05d4cef..cd7c34e 100644 --- a/flake.nix +++ b/flake.nix @@ -45,50 +45,5 @@ }; }; - outputs = - inputs: - let - lib = import ./lib inputs; - in - lib.gerg-utils { allowUnfree = true; } ( - { pkgs, system, ... }: - { - inherit lib; - nixosConfigurations = lib.mkHosts "x86_64-linux" [ - "gerg-desktop" - "game-desktop" - "media-laptop" - "iso" - ]; - - nixosModules = lib.mkModules ./modules; - - diskoConfigurations = lib.mkDisko [ - "gerg-desktop" - "game-desktop" - "media-laptop" - ]; - formatter.${system} = pkgs.writeShellApplication { - name = "lint"; - runtimeInputs = [ - (pkgs.nixfmt.overrideAttrs { - version = "0.6.0-${inputs.nixfmt.shortRev}"; - - src = inputs.nixfmt; - }) - pkgs.deadnix - pkgs.statix - pkgs.fd - ]; - text = '' - fd '.*\.nix' . -x statix fix -- {} \; - fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \; - ''; - }; - - devShells.${system}.default = pkgs.mkShell { packages = [ pkgs.sops ]; }; - - packages.${system} = lib.mkPackages ./packages pkgs; - } - ); + outputs = i: import ./outputs.nix i; } diff --git a/outputs.nix b/outputs.nix new file mode 100644 index 0000000..75d38aa --- /dev/null +++ b/outputs.nix @@ -0,0 +1,45 @@ +inputs: +let + lib = import ./lib inputs; +in +lib.gerg-utils { allowUnfree = true; } ( + { pkgs, system, ... }: + { + inherit lib; + nixosConfigurations = lib.mkHosts "x86_64-linux" [ + "gerg-desktop" + "game-desktop" + "media-laptop" + "iso" + ]; + + nixosModules = lib.mkModules ./modules; + + diskoConfigurations = lib.mkDisko [ + "gerg-desktop" + "game-desktop" + "media-laptop" + ]; + formatter.${system} = pkgs.writeShellApplication { + name = "lint"; + runtimeInputs = [ + (pkgs.nixfmt.overrideAttrs { + version = "0.6.0-${inputs.nixfmt.shortRev}"; + + src = inputs.nixfmt; + }) + pkgs.deadnix + pkgs.statix + pkgs.fd + ]; + text = '' + fd '.*\.nix' . -x statix fix -- {} \; + fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \; + ''; + }; + + devShells.${system}.default = pkgs.mkShell { packages = [ pkgs.sops ]; }; + + packages.${system} = lib.mkPackages ./packages pkgs; + } +)