From 32ff8d25746d19fd90fc3e3f94821501ec932216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 3 Apr 2023 21:41:49 +0300 Subject: [PATCH] formatter + nixConfig --- flake.nix | 42 ++++++++++++++++++++++++++---------------- nixpkgs.nix | 2 +- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 4e5cf5a..352c15e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,9 @@ { + nixConfig = { + trusted-substituters = "https://cache.nixos.org/"; + trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="; + extra-experimental-features = "nix-command flakes"; + }; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small"; flake-compat = { @@ -7,21 +12,26 @@ }; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { nixpkgs, flake-utils, ... }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { inherit system; }; - devDeps = with pkgs; [ bash hugo zopfli brotli parallel ]; - in - { - devShells.default = pkgs.mkShell { - name = "rules_nixpkgs_shell"; - packages = devDeps; - }; + outputs = { + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs {inherit system;}; + devDeps = with pkgs; [bash hugo zopfli brotli parallel]; + in { + devShells.default = pkgs.mkShell { + name = "rules_nixpkgs_shell"; + packages = devDeps; + }; - # TODO how to run scripts/build as a result of `nix run .`? - #packages = flake-utils.lib.mkApp { - # name = "build - #}; - }); + # TODO how to run scripts/build as a result of `nix run .`? + #packages = flake-utils.lib.mkApp { + # name = "build + #}; + + formatter = pkgs.alejandra; + + }); } diff --git a/nixpkgs.nix b/nixpkgs.nix index 375f4f6..fc2546b 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