ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
This commit is contained in:
Stefan Ellmauthaler 2023-10-02 14:59:02 +02:00
parent a9f6c0aec2
commit 1ab2714d4a
Failed to extract signature
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.nix
View File

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

3
lib/files.nix
View File

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

7
packages/emacs/default.nix
View File

@ -1,12 +1,11 @@
{ {
config,
lib, lib,
pkgs, pkgs,
... ...
}: }:
with lib; let with lib; let
defaultEl = ./default.el; 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" '' 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 "${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") (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 ${defaultEl} $out/share/emacs/site-lisp/default.el
cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el
''; '';
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: let
lpkgs = import ./packages.nix {inherit config lib pkgs epkgs;}; lpkgs = import ./packages.nix {inherit lib pkgs epkgs;};
#[ (defaultConfig lpkgs) ] ++ (with pkgs; [ #[ (defaultConfig lpkgs) ] ++ (with pkgs; [
# aspell # aspell
# emacs-all-the-icons-fonts # emacs-all-the-icons-fonts

1
packages/emacs/packages.nix
View File

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