refactor(packages): expose mkEmacs function

.editorconfig

@@ -0,0 +1,3 @@
+[*.nix]
+indent_style = space
+indent_size = 2

.gitignore

@@ -7,3 +7,5 @@
 !/.gitignore
 !/README.org
 !/media
+!/.editorconfig
+!/lib.nix

flake.nix

@@ -11,25 +11,24 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs =
+  outputs = inputs: let
-    inputs:
+    lib = inputs.nixpkgs.lib.extend (import ./lib.nix);
-    inputs.parts.lib.mkFlake { inherit inputs; } {
+  in
+    inputs.parts.lib.mkFlake {
+      inherit inputs;
+      specialArgs.lib = lib;
+    } {
       systems = [
         "x86_64-linux"
       ];
 
-      perSystem =
+      perSystem = {
-        {
         pkgs,
         self',
         config,
         system,
         ...
-        }:
+      }: {
-        let
-          inherit (import ./emacs/mkEmacs.nix pkgs) mkEmacs;
-        in
-        {
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
           overlays = [
@@ -37,12 +36,16 @@
           ];
         };
 
-          packages = {
+        packages = builtins.mapAttrs (_: v:
-            pankomacs = mkEmacs pkgs.emacs30-pgtk;
+          lib.mkEmacs {
-            pankomacs-x11 = mkEmacs pkgs.emacs30-gtk3;
+            inherit pkgs;
+            emacs = v;
+          }) {
+          pankomacs = pkgs.emacs30-pgtk;
+          pankomacs-x11 = pkgs.emacs30-gtk3;
         };
 
-          formatter = pkgs.nixfmt-rfc-style;
+        formatter = pkgs.alejandra;
       };
     };
 }

lib.nix

@@ -1,7 +1,9 @@
-{ pkgs, ... }:
+final: prev: {
-let
+  mkEmacs = {
-  mkEmacsPackage =
+    pkgs,
-    {
+    emacs,
+  }: let
+    mkEmacsPackage = {
       epkgs,
       pname,
       version,
@@ -17,17 +19,14 @@ let
           }
       ) {inherit (epkgs) trivialBuild;};
   in
-{
-  mkEmacs =
-    emacs:
     pkgs.emacsWithPackagesFromUsePackage {
       package = emacs;
       defaultInitFile = true;
       config = ./config.el;
-      extraEmacsPackages =
+      extraEmacsPackages = epkgs:
-        epkgs:
         builtins.attrValues {
-          inherit (epkgs)
+          inherit
+            (epkgs)
             spacious-padding
             mood-line
             which-key