emacs: apply nixfmt

This commit is contained in:
Robert Helgesson 2020-05-25 00:45:51 +02:00
parent f90b86b577
commit ac6235e53d
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 6 additions and 11 deletions

1
format
View file

@ -34,7 +34,6 @@ find . -name '*.nix' \
! -path ./modules/modules.nix \ ! -path ./modules/modules.nix \
! -path ./modules/programs/afew.nix \ ! -path ./modules/programs/afew.nix \
! -path ./modules/programs/bash.nix \ ! -path ./modules/programs/bash.nix \
! -path ./modules/programs/emacs.nix \
! -path ./modules/programs/firefox.nix \ ! -path ./modules/programs/firefox.nix \
! -path ./modules/programs/gpg.nix \ ! -path ./modules/programs/gpg.nix \
! -path ./modules/programs/lesspipe.nix \ ! -path ./modules/programs/lesspipe.nix \

View file

@ -8,16 +8,12 @@ let
# Copied from all-packages.nix, with modifications to support # Copied from all-packages.nix, with modifications to support
# overrides. # overrides.
emacsPackages = emacsPackages = let epkgs = pkgs.emacsPackagesGen cfg.package;
let in epkgs.overrideScope' cfg.overrides;
epkgs = pkgs.emacsPackagesGen cfg.package;
in
epkgs.overrideScope' cfg.overrides;
emacsWithPackages = emacsPackages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages;
in in {
{
meta.maintainers = [ maintainers.rycee ]; meta.maintainers = [ maintainers.rycee ];
options = { options = {
@ -33,7 +29,7 @@ in
}; };
extraPackages = mkOption { extraPackages = mkOption {
default = self: []; default = self: [ ];
type = hm.types.selectorFunction; type = hm.types.selectorFunction;
defaultText = "epkgs: []"; defaultText = "epkgs: []";
example = literalExample "epkgs: [ epkgs.emms epkgs.magit ]"; example = literalExample "epkgs: [ epkgs.emms epkgs.magit ]";
@ -45,7 +41,7 @@ in
}; };
overrides = mkOption { overrides = mkOption {
default = self: super: {}; default = self: super: { };
type = hm.types.overlayFunction; type = hm.types.overlayFunction;
defaultText = "self: super: {}"; defaultText = "self: super: {}";
example = literalExample '' example = literalExample ''