From: Bobbe Date: Fri, 20 Feb 2026 16:34:26 +0000 (+0100) Subject: Add nixfmt to nix devShell, reformat flake.nix, Ignore flake.lock X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0303516fa0ac066f7dd2f4904468cfd0a9c8363a;p=stevenblack-hosts.git Add nixfmt to nix devShell, reformat flake.nix, Ignore flake.lock --- diff --git a/.gitignore b/.gitignore index 72dde8933..8cf7b5353 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ hosts-* /node_modules/ /package-lock.json /yarn.lock +/flake.lock diff --git a/flake.nix b/flake.nix index 342068f6b..c55779508 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,18 @@ { description = "Unified hosts file with base extensions."; - outputs = { self, nixpkgs, ... }@inputs: + outputs = + { + self, + nixpkgs, + ... + }: let forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.unix; - - nixpkgsFor = forAllSystems (system: import nixpkgs { - inherit system; - }); + nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); in { - nixosModule = { config, ... }: + nixosModule = + { config, ... }: let inherit (nixpkgs) lib; cfg = config.networking.stevenBlackHosts; @@ -35,21 +38,30 @@ config = lib.mkIf cfg.enable { networking.extraHosts = let - orig = builtins.readFile ("${self}/" + (lib.optionalString (alternatesList != []) alternatesPath) + "hosts"); + orig = builtins.readFile ( + "${self}/" + (lib.optionalString (alternatesList != [ ]) alternatesPath) + "hosts" + ); ipv6 = builtins.replaceStrings [ "0.0.0.0" ] [ "::" ] orig; in lib.mkAfter (orig + (lib.optionalString cfg.enableIPv6 ("\n" + ipv6))); }; }; - devShells = forAllSystems (system: - let pkgs = nixpkgsFor.${system}; in + devShells = forAllSystems ( + system: + let + pkgs = nixpkgsFor.${system}; + in { default = pkgs.mkShell { - buildInputs = with pkgs; [ - python3 - python3Packages.flake8 - python3Packages.requests + packages = with pkgs; [ + nixfmt + (python3.withPackages ( + pythonPackages: with pythonPackages; [ + flake8 + requests + ] + )) ]; }; }