From 15db81eb3b0cf2f8742f3cbe3b0c320d20d3eb5e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 31 May 2021 23:01:21 +0200 Subject: [PATCH] flake: change format --- flake.nix | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 826ce73..3ff11ba 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,14 @@ }; }; - outputs = { self, futils, home-manager, nixpkgs, nur } @ inputs: + outputs = + inputs @ + { self + , futils + , home-manager + , nixpkgs + , nur + }: let inherit (futils.lib) eachDefaultSystem; @@ -81,28 +88,29 @@ in eachDefaultSystem (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - in - rec { - apps = { - diff-flake = futils.lib.mkApp { drv = packages.diff-flake; }; - }; + let + pkgs = nixpkgs.legacyPackages.${system}; + in + rec { + apps = { + diff-flake = futils.lib.mkApp { drv = packages.diff-flake; }; + }; - defaultApp = apps.diff-flake; + defaultApp = apps.diff-flake; - devShell = pkgs.mkShell { - name = "NixOS-config"; - buildInputs = with pkgs; [ - git-crypt - gitAndTools.pre-commit - gnupg - nixpkgs-fmt - ]; - }; + devShell = pkgs.mkShell { + name = "NixOS-config"; - packages = import ./pkgs { inherit pkgs; }; - }) // { + buildInputs = with pkgs; [ + git-crypt + gitAndTools.pre-commit + gnupg + nixpkgs-fmt + ]; + }; + + packages = import ./pkgs { inherit pkgs; }; + }) // { overlay = self.overlays.pkgs; overlays = import ./overlays // {