aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xformat1
-rw-r--r--modules/programs/emacs.nix16
2 files changed, 6 insertions, 11 deletions
diff --git a/format b/format
index 2f4e297b311..6007a37115e 100755
--- a/format
+++ b/format
@@ -34,7 +34,6 @@ find . -name '*.nix' \
! -path ./modules/modules.nix \
! -path ./modules/programs/afew.nix \
! -path ./modules/programs/bash.nix \
- ! -path ./modules/programs/emacs.nix \
! -path ./modules/programs/firefox.nix \
! -path ./modules/programs/gpg.nix \
! -path ./modules/programs/lesspipe.nix \
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 987a9f2431e..f3e14eb4b9e 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -8,16 +8,12 @@ let
# Copied from all-packages.nix, with modifications to support
# overrides.
- emacsPackages =
- let
- epkgs = pkgs.emacsPackagesGen cfg.package;
- in
- epkgs.overrideScope' cfg.overrides;
- emacsWithPackages = emacsPackages.emacsWithPackages;
+ emacsPackages = let epkgs = pkgs.emacsPackagesGen cfg.package;
+ in epkgs.overrideScope' cfg.overrides;
-in
+ emacsWithPackages = emacsPackages.emacsWithPackages;
-{
+in {
meta.maintainers = [ maintainers.rycee ];
options = {
@@ -33,7 +29,7 @@ in
};
extraPackages = mkOption {
- default = self: [];
+ default = self: [ ];
type = hm.types.selectorFunction;
defaultText = "epkgs: []";
example = literalExample "epkgs: [ epkgs.emms epkgs.magit ]";
@@ -45,7 +41,7 @@ in
};
overrides = mkOption {
- default = self: super: {};
+ default = self: super: { };
type = hm.types.overlayFunction;
defaultText = "self: super: {}";
example = literalExample ''