diff --git a/format b/format index 2f4e297b..6007a371 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 987a9f24..f3e14eb4 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; + emacsPackages = let epkgs = pkgs.emacsPackagesGen cfg.package; + in epkgs.overrideScope' cfg.overrides; + emacsWithPackages = emacsPackages.emacsWithPackages; -in - -{ +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 ''