From b6149f678eea33ce233b4f53de26ef8c3e3feea2 Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Fri, 27 Mar 2026 12:13:00 +0100 Subject: switch to using flake-parts --- flake.nix | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 03914ad..cdd1001 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - futils.url = "git+https://git.sorre.xyz/isabella/futils"; + flake-parts.url = "github:hercules-ci/flake-parts"; wrapper-manager.url = "github:viperML/wrapper-manager"; emacs-overlay = { url = "github:nix-community/emacs-overlay"; @@ -12,27 +12,33 @@ }; outputs = - { - self, - nixpkgs, - futils, - emacs-overlay, - wrapper-manager, - }: - futils.lib.eachSystem ( - system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ emacs-overlay.overlays.default ]; - }; - in + inputs@{ flake-parts, wrapper-manager, ... }: + flake-parts.lib.mkFlake { inherit inputs; } ( + { config, ... }: { - legacyPackages = import ./default.nix { - # inherit self pkgs wrapper-manager system; - inherit pkgs wrapper-manager; - }; - packages = nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system}; + systems = [ "x86_64-linux" ]; + perSystem = + { + self', + pkgs, + config, + system, + ... + }: + { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ + inputs.emacs-overlay.overlays.default + ]; + }; + + legacyPackages = import ./default.nix { + inherit pkgs wrapper-manager; + }; + + packages = pkgs.lib.filterAttrs (_: v: pkgs.lib.isDerivation v) self'.legacyPackages; + }; } ); } -- cgit v1.3.1