feat: use numtide/blueprint instead of flake.parts

Signed-off-by: Brian McGee <[email protected]>
numtide · Jun 30, 2024 · 986f020 · 986f020
1 parent 30d30b5
commit 986f020
Show file tree

Hide file tree

Showing 19 changed files with 295 additions and 363 deletions.
diff --git a/.envrc b/.envrc
@@ -1,6 +1,10 @@
 dotenv
+
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
     source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
+
+watch_file flake.nix
 watch_file nix/devshell.nix
+
 use flake
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -27,7 +27,7 @@ jobs:
             - name: Build the docs
               id: build
               run: |
-                  nix build .#docs
+                  nix build .#treefmt-docs
                   echo "result=$(readlink ./result)" >> $GITHUB_OUTPUT
             - name: Upload artifact
               uses: actions/upload-pages-artifact@v3

diff --git a/default.nix b/default.nix
@@ -2,7 +2,13 @@
 {system ? builtins.currentSystem}: let
   lock = builtins.fromJSON (builtins.readFile ./flake.lock);
 
-  inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
+  inherit
+    (lock.nodes.flake-compat.locked)
+    owner
+    repo
+    rev
+    narHash
+    ;
 
   flake-compat = fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,22 +2,13 @@
   description = "Treefmt: once CLI to format your repo";
 
   nixConfig = {
-    extra-substituters = [
-      "https://numtide.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-    ];
+    extra-substituters = ["https://numtide.cachix.org"];
+    extra-trusted-public-keys = ["numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="];
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
+    blueprint = {
+      url = "github:numtide/blueprint";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     devshell = {
@@ -29,28 +20,37 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "devshell/flake-utils";
     };
-    nix-filter.url = "github:numtide/nix-filter";
     flake-compat.url = "github:nix-community/flake-compat";
+    nix-filter.url = "github:numtide/nix-filter";
     nix-github-actions = {
       url = "github:nix-community/nix-github-actions";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs @ {flake-parts, ...}:
-    flake-parts.lib.mkFlake
-    {
+  outputs = inputs: let
+    inherit (inputs.nixpkgs) lib;
+  in
+    inputs.blueprint {
       inherit inputs;
+      prefix = "nix/";
+      nixpkgs.config = {
+        allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["terraform"];
+      };
     }
-    {
-      imports = [
-        ./nix
-      ];
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
+    // {
+      githubActions = inputs.nix-github-actions.lib.mkGithubMatrix {
+        checks =
+          lib.getAttrs [
+            "x86_64-linux"
+            "x86_64-darwin"
+          ]
+          inputs.self.checks;
+      };
     };
 }
diff --git a/nix/checks.nix b/nix/checks.nix
diff --git a/nix/default.nix b/nix/default.nix
diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -1,59 +1,73 @@
-{inputs, ...}: {
-  imports = [
-    inputs.devshell.flakeModule
-  ];
+{
+  pkgs,
+  perSystem,
+  ...
+}: let
+  inherit (pkgs) lib;
+  inherit (pkgs.stdenv) isLinux isDarwin;
+in
+  perSystem.devshell.mkShell {
+    env = [
+      {
+        name = "GOROOT";
+        value = pkgs.go + "/share/go";
+      }
+      {
+        name = "LD_LIBRARY_PATH";
+        value = "$DEVSHELL_DIR/lib";
+      }
+    ];
 
-  config.perSystem = {
-    lib,
-    pkgs,
-    config,
-    ...
-  }: let
-    inherit (pkgs.stdenv) isLinux isDarwin;
-  in {
-    config.devshells.default = {
-      env = [
-        {
-          name = "GOROOT";
-          value = pkgs.go + "/share/go";
-        }
-        {
-          name = "LD_LIBRARY_PATH";
-          value = "$DEVSHELL_DIR/lib";
-        }
-      ];
+    packages = lib.mkMerge [
+      (with pkgs; [
+        # golang
+        go
+        goreleaser
+        golangci-lint
+        delve
+        pprof
+        graphviz
 
-      packages = lib.mkMerge [
-        (with pkgs; [
-          # golang
-          go
-          goreleaser
-          golangci-lint
-          delve
-          pprof
-          graphviz
-        ])
-        # platform dependent CGO dependencies
-        (lib.mkIf isLinux [
-          pkgs.gcc
-        ])
-        (lib.mkIf isDarwin [
-          pkgs.darwin.cctools
-        ])
-        # include formatters for development and testing
-        (import ./formatters.nix pkgs)
-      ];
+        # docs
+        nodejs
+      ])
+      # platform dependent CGO dependencies
+      (lib.mkIf isLinux [pkgs.gcc])
+      (lib.mkIf isDarwin [pkgs.darwin.cctools])
+      # include formatters for development and testing
+      (import ./packages/treefmt/formatters.nix pkgs)
+    ];
 
-      commands = [
-        {
-          category = "development";
-          package = pkgs.gomod2nix;
-        }
-        {
-          category = "development";
-          package = pkgs.enumer;
-        }
-      ];
-    };
-  };
-}
+    commands = [
+      {package = perSystem.gomod2nix.default;}
+      {
+        name = "docs:dev";
+        help = "serve docs for local development";
+        command = "cd $PRJ_ROOT/docs && npm ci && npm run dev";
+      }
+      {
+        name = "docs:build";
+        help = "create a production build of docs";
+        command = "cd $PRJ_ROOT/docs && npm ci && npm run build";
+      }
+      {
+        name = "docs:preview";
+        help = "preview a production build of docs";
+        command = "cd $PRJ_ROOT/docs && npm ci && npm run preview";
+      }
+      {
+        help = "generate terminal gifs";
+        package = pkgs.writeShellApplication {
+          name = "vhs";
+          runtimeInputs =
+            [
+              perSystem.self.treefmt
+              pkgs.rsync
+              pkgs.vhs
+            ]
+            ++ (import ./packages/treefmt/formatters.nix pkgs);
+          text = ''vhs "$@"'';
+        };
+      }
+    ];
+  }