christoph/flake-nixinator
1
Fork 0
Code Activity

add official emacs option to emacs module

Browse Source
This commit is contained in:
Christoph Urlacher
2022-10-15 19:14:52 +02:00
parent 16814b4214
commit 141f4c6224
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
home/modules/emacs.nix
View File

@ -20,6 +20,7 @@ in {
enable = mkEnableOpt "Emacs module"; enable = mkEnableOpt "Emacs module";
# TODO: Use an enum for this not individual options # TODO: Use an enum for this not individual options
nixpkgs = mkBoolOpt false "Use Emacs from the official repositories";
nativeComp = mkBoolOpt false "Use Emacs 28.x branch with native comp support"; nativeComp = mkBoolOpt false "Use Emacs 28.x branch with native comp support";
pgtkNativeComp = mkBoolOpt false "Use Emacs 29.x branch with native comp and pure gtk support"; pgtkNativeComp = mkBoolOpt false "Use Emacs 29.x branch with native comp and pure gtk support";
@ -41,12 +42,16 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [
(mkIf cfg.nativeComp { (mkIf cfg.nativeComp {
assertion = !cfg.pgtkNativeComp; assertion = !cfg.pgtkNativeComp && !cfg.nixpkgs;
message = "Can't enable both nativeComp and pgtkNativeComp!"; message = "Can't enable more than one Emacs package!";
}) })
(mkIf cfg.pgtkNativeComp { (mkIf cfg.pgtkNativeComp {
assertion = !cfg.nativeComp; assertion = !cfg.nativeComp && !cfg.nixpkgs;
message = "Can't enable both nativeComp and pgtkNativeComp!"; message = "Can't enable more than one Emacs package!";
})
(mkIf cfg.nixpkgs {
assertion = !cfg.nativeComp && !cfg.pgtkNativeComp;
message = "Can't enable more than one Emacs package!";
}) })
]; ];
@ -54,6 +59,7 @@ in {
home.packages = with pkgs; builtins.concatLists [ home.packages = with pkgs; builtins.concatLists [
(optionals cfg.nativeComp [ ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm ])) ]) (optionals cfg.nativeComp [ ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm ])) ])
(optionals cfg.pgtkNativeComp [ ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm ])) ]) (optionals cfg.pgtkNativeComp [ ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm ])) ])
(optionals cfg.nixpkgs [ ((emacsPackagesFor emacs).emacsWithPackages (epkgs: [ epkgs.vterm ])) ])
# TODO: Check what hlissner has enabled # TODO: Check what hlissner has enabled
(optionals cfg.doom.enable [ (optionals cfg.doom.enable [
@ -69,6 +75,9 @@ in {
maim maim
bashInteractive # For keychain bashInteractive # For keychain
# TODO: I don't want to have this here permanently, maybe put in a shell.nix if compilation is needed?
gcc # Need this for org roam
# withPackages expects a function that gets all the packages as argument and returns a list with the packages we want # withPackages expects a function that gets all the packages as argument and returns a list with the packages we want
(python310.withPackages (ppkgs: [ ppkgs.pygments ])) # Latex minted (python310.withPackages (ppkgs: [ ppkgs.pygments ])) # Latex minted
@ -115,7 +124,7 @@ in {
(mkIf (cfg.doom.enable && cfg.doom.autoSync) { (mkIf (cfg.doom.enable && cfg.doom.autoSync) {
syncDoomEmacs = hm.dag.entryAfter [ "writeBoundary" "linkDoomConfig" ] '' syncDoomEmacs = hm.dag.entryAfter [ "writeBoundary" "linkDoomConfig" ] ''
${config.home.homeDirectory}/.emacs.d/bin/doom sync ${config.home.homeDirectory}/.emacs.d/bin/doom sync &
''; '';
}) })