build: use flake-parts partitions

terlar · Sep 10, 2024 · b672c89 · b672c89
1 parent 88f6671
commit b672c89
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 107 deletions.
diff --git a/.envrc b/.envrc
@@ -1,8 +1,8 @@
 #! /bin/sh
-export NIX_USER_CONF_FILES="$PWD/nix.conf"
+export NIX_USER_CONF_FILES="$PWD/dev/nix.conf"
 
 if nix print-dev-env --help >/dev/null 2>&1; then
-    use flake ./dev
+    use flake
 else
     use nix
 fi

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,28 +32,6 @@ jobs:
       - name: Check
         run: nix flake check
 
-  dev-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-      - uses: DeterminateSystems/nix-installer-action@da36cb69b1c3247ad7a1f931ebfd954a1105ef14 # v14
-        with:
-          nix-package-url: https://releases.nixos.org/nix/nix-2.18.2/nix-2.18.2-x86_64-linux.tar.xz
-          extra-conf: |
-            http-connections = 50
-            max-jobs = auto
-          diagnostic-endpoint: ''
-
-      - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
-        with:
-          useDaemon: true
-          name: terlar
-          extraPullNames: cuda-maintainers
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
-      - name: Check
-        run: nix flake check ./dev
-
   build-home-configuration:
     strategy:
       matrix:

diff --git a/dev/flake-module.nix b/dev/flake-module.nix
@@ -0,0 +1,53 @@
+{ inputs, ... }:
+
+{
+  imports = [ inputs.dev-flake.flakeModule ];
+
+  dev = {
+    name = "terlar/nix-config";
+    rootSrc = ../.;
+  };
+
+  perSystem =
+    { pkgs, ... }:
+    {
+      treefmt = {
+        programs.nixfmt = {
+          enable = true;
+          package = pkgs.nixfmt-rfc-style;
+        };
+        settings.formatter.fish = {
+          command = pkgs.writeShellApplication {
+            name = "fish_indent-wrapper";
+            runtimeInputs = [
+              pkgs.fish
+              pkgs.findutils
+            ];
+            text = ''
+              fish_indent --check "$@" 2>&1 | xargs --no-run-if-empty fish_indent --write || true
+            '';
+          };
+          includes = [ "*.fish" ];
+        };
+      };
+
+      devshells.default = {
+        commands = [
+          {
+            name = "repl";
+            command = ''
+              exec nix repl --file "$PRJ_ROOT/dev/repl.nix" "$@"
+            '';
+            help = "Development REPL";
+          }
+        ];
+
+        env = [
+          {
+            name = "NIX_USER_CONF_FILES";
+            value = toString ./nix.conf;
+          }
+        ];
+      };
+    };
+}
diff --git a/dev/flake.lock b/dev/flake.lock
diff --git a/dev/flake.nix b/dev/flake.nix
@@ -1,11 +1,7 @@
 {
-  description = "Development environment";
+  description = "Dependencies for development purposes";
 
   inputs = {
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
     dev-flake = {
       url = "github:terlar/dev-flake";
       inputs = {
@@ -15,66 +11,11 @@
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
 
-    # Compatibility
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
   };
 
-  outputs =
-    inputs:
-    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" ];
-
-      imports = [ inputs.dev-flake.flakeModule ];
-
-      dev = {
-        name = "terlar/nix-config";
-        rootSrc = ../.;
-      };
-
-      perSystem =
-        { pkgs, ... }:
-        {
-          treefmt = {
-            programs.nixfmt = {
-              enable = true;
-              package = pkgs.nixfmt-rfc-style;
-            };
-            settings.formatter.fish = {
-              command = pkgs.writeShellApplication {
-                name = "fish_indent-wrapper";
-                runtimeInputs = [
-                  pkgs.fish
-                  pkgs.findutils
-                ];
-                text = ''
-                  fish_indent --check "$@" 2>&1 | xargs --no-run-if-empty fish_indent --write || true
-                '';
-              };
-              includes = [ "*.fish" ];
-            };
-          };
-
-          devshells.default = {
-            commands = [
-              {
-                name = "repl";
-                command = ''
-                  exec nix repl --file "$PRJ_ROOT/dev/repl.nix" "$@"
-                '';
-                help = "Development REPL";
-              }
-            ];
-
-            env = [
-              {
-                name = "NIX_USER_CONF_FILES";
-                value = toString ./nix.conf;
-              }
-            ];
-          };
-        };
-    };
+  outputs = _: { };
 }
diff --git a/flake.nix b/flake.nix
@@ -39,12 +39,26 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
+        flake-parts.flakeModules.partitions
+
         ./modules/flake/home-manager.nix
         ./configurations/home/terje
         ./configurations/nixos/kong
         ./configurations/nixos/installer-yubikey
       ];
 
+      partitionedAttrs = {
+        checks = "dev";
+        devShells = "dev";
+      };
+
+      partitions.dev = {
+        extraInputsFlake = ./dev;
+        module = {
+          imports = [ ./dev/flake-module.nix ];
+        };
+      };
+
       flake = {
         lib = import ./lib.nix { inherit (nixpkgs) lib; };
 

diff --git a/shell.nix b/shell.nix
@@ -4,4 +4,4 @@ in
 (import (fetchTarball {
   url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
   sha256 = lock.nodes.flake-compat.locked.narHash;
-}) { src = ./dev; }).shellNix
+}) { src = ./.; }).shellNix