flake.nix: switch from flake-utils to flake-parts

nix-community · Dec 12, 2023 · efdac84 · efdac84
1 parent c914912
commit efdac84
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,8 +2,8 @@
   description = "A neovim configuration system for NixOS";
 
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-parts.url = "github:hercules-ci/flake-parts";
 
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
@@ -14,7 +14,7 @@
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
+    flake-parts,
     pre-commit-hooks,
     ...
   } @ inputs:
@@ -38,21 +38,31 @@
               };
             };
           }
-
-          # ./plugins/default.nix
         ];
 
       wrapperArgs = {
         inherit modules;
         inherit self;
       };
+    in
+      flake-parts.lib.mkFlake {inherit inputs;} ({
+        withSystem,
+        config,
+        lib,
+        ...
+      }: {
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "x86_64-darwin"
+          "aarch64-darwin"
+        ];
 
-      flakeOutput =
-        flake-utils.lib.eachDefaultSystem
-        (system: let
-          pkgs = import nixpkgs {inherit system;};
-          # Some nixvim supported plugins require the use of unfree packages.
-          # This unfree-friendly pkgs is used for documentation and testing only.
+        perSystem = {
+          pkgs,
+          system,
+          ...
+        }: let
           pkgs-unfree = import nixpkgs {
             inherit system;
             config.allowUnfree = true;
@@ -111,6 +121,7 @@
               pkgs = pkgs-unfree;
               modules = modules pkgs;
             });
+
           legacyPackages = rec {
             makeNixvimWithModule = import ./wrappers/standalone.nix pkgs wrapperArgs;
             makeNixvim = configuration:
@@ -120,40 +131,51 @@
                 };
               };
           };
+
           formatter = pkgs.alejandra;
-          lib = import ./lib {
-            inherit pkgs;
-            inherit (pkgs) lib;
-            inherit (self.legacyPackages."${system}") makeNixvim;
-          };
-        });
-    in
-      flakeOutput
-      // {
-        nixosModules.nixvim = import ./wrappers/nixos.nix wrapperArgs;
-        homeManagerModules.nixvim = import ./wrappers/hm.nix wrapperArgs;
-        nixDarwinModules.nixvim = import ./wrappers/darwin.nix wrapperArgs;
-        rawModules.nixvim = nixvimModules;
+        };
 
-        overlays.default = final: prev: {
-          nixvim = rec {
-            makeNixvimWithModule = import ./wrappers/standalone.nix prev wrapperArgs;
-            makeNixvim = configuration:
-              makeNixvimWithModule {
-                module = {
-                  config = configuration;
+        flake = {
+          nixosModules.nixvim = import ./wrappers/nixos.nix wrapperArgs;
+          homeManagerModules.nixvim = import ./wrappers/hm.nix wrapperArgs;
+          nixDarwinModules.nixvim = import ./wrappers/darwin.nix wrapperArgs;
+          rawModules.nixvim = nixvimModules;
+
+          overlays.default = final: prev: {
+            nixvim = rec {
+              makeNixvimWithModule = import ./wrappers/standalone.nix prev wrapperArgs;
+              makeNixvim = configuration:
+                makeNixvimWithModule {
+                  module = {
+                    config = configuration;
+                  };
                 };
-              };
+            };
           };
-        };
 
-        templates = let
-          simple = {
-            path = ./templates/simple;
-            description = "A simple nix flake template for getting started with nixvim";
+          lib = lib.genAttrs config.systems (
+            lib.flip withSystem (
+              {
+                pkgs,
+                system,
+                ...
+              }:
+                import ./lib {
+                  inherit pkgs;
+                  inherit (pkgs) lib;
+                  inherit (self.legacyPackages."${system}") makeNixvim;
+                }
+            )
+          );
+
+          templates = let
+            simple = {
+              path = ./templates/simple;
+              description = "A simple nix flake template for getting started with nixvim";
+            };
+          in {
+            default = simple;
           };
-        in {
-          default = simple;
         };
-      };
+      });
 }