From 738d2de80d28148158bae6dc7f0d6ebed16c474f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 9 Oct 2024 22:00:02 -0400 Subject: [PATCH] fmt --- flake.nix | 41 ++++++++++++++++++++++++++--------------- nixpkgs.nix | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index fed8a7b..2b79481 100644 --- a/flake.nix +++ b/flake.nix @@ -8,20 +8,31 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # TODO 24.11 flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { - self, - nixpkgs, - flake-utils, - ... - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs {inherit system;}; - in { - devShells.default = pkgs.mkShell { - LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; - packages = with pkgs; [hugo brotli zopfli parallel dart-sass]; - }; + outputs = + { + self, + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { inherit system; }; + in + { + devShells.default = pkgs.mkShell { + LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + packages = with pkgs; [ + hugo + brotli + zopfli + parallel + dart-sass + ]; + }; - formatter = pkgs.alejandra; - }); + formatter = pkgs.nixfmt-rfc-style; + } + ); } diff --git a/nixpkgs.nix b/nixpkgs.nix index fc2546b..375f4f6 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -3,4 +3,4 @@ let spec = lock.nodes.nixpkgs.locked; nixpkgs = fetchTarball "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz"; in - import nixpkgs +import nixpkgs