fix lib function and remove app to expose only the emacs package

Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>

flake.nix

@@ -151,17 +151,6 @@
         flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl";
       };
 
-      packages =
-        (flake-utils-plus.lib.exportPackages {
-            inherit
-              (overlays)
-              default
-              flake-utils-plus
-              ;
-          }
-          channels)
-        // {inherit (channels.nixpkgs) emacs;};
-
       outputsBuilder = channels: {
         devShells = let
           pkgs = channels.nixpkgs;
@@ -191,13 +180,16 @@
           default = sops;
         };
         formatter = channels.nixpkgs.alejandra;
-        apps = {
-          emacs = flake-utils-plus.lib.mkApp {
-            drv =
-              self.nixosConfigurations.stel-xps.config.services.emacs.package;
-            exePath = "/bin/emacs";
-          };
-        };
+        packages =
+          (flake-utils-plus.lib.exportPackages {
+              inherit
+                (overlays)
+                default
+                flake-utils-plus
+                ;
+            }
+            channels)
+          // {inherit (channels.nixpkgs) emacs;};
       };
 
       templates = discoverTemplates ./templates {

lib/files.nix

@@ -27,8 +27,7 @@ with prev; rec {
   discoverOverlay = dir: final: prev: (withModules dir ({
     path,
     name,
-  }:
-    nameValuePair name (final.callPackage path {})));
+  }: (final.callPackage path {})));
 
   discoverMachines = dir: args:
     withModules dir ({

packages/emacs/default.nix

@@ -1,12 +1,11 @@
 {
-  config,
   lib,
   pkgs,
   ...
 }:
 with lib; let
   defaultEl = ./default.el;
-  environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode
+  #environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode
   localsettings = pkgs.writeText "local-settings.el" ''
     (defconst elss/paths/cpptools "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools")
     (defconst elss/paths/cpptools-program "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7")
@@ -18,8 +17,8 @@ with lib; let
     cp ${defaultEl} $out/share/emacs/site-lisp/default.el
     cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el
   '';
-  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
-    lpkgs = import ./packages.nix {inherit config lib pkgs epkgs;};
+  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: let
+    lpkgs = import ./packages.nix {inherit lib pkgs epkgs;};
     #[ (defaultConfig lpkgs) ] ++ (with pkgs; [
     #  aspell
     #  emacs-all-the-icons-fonts

packages/emacs/packages.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   epkgs,