Commit 791d4692a003

Vincent Demeester <vincent@sbr.pm>
2020-05-12 12:47:20
services.emacs: fix daemon name
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent da1ab03
Changed files (2)
modules
modules/profiles/emacs.nix
@@ -176,8 +176,9 @@ in
         services.emacs-server = {
           enable = true;
           package = myEmacs;
+          name = "org";
           shell = pkgs.zsh + "/bin/zsh -i -c";
-          extraOptions = "--dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp --daemon=org";
+          extraOptions = "--dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp";
         };
       }
     )
modules/services/emacs-server.nix
@@ -6,6 +6,11 @@ in
 {
   options.services.emacs-server = {
     enable = mkEnableOption "the Emacs daemon";
+    name = mkOption {
+      type = types.str;
+      description = "Name of the emacs server";
+      default = "default";
+    };
     package = mkOption {
       type = types.package;
       description = "The Emacs package to use for running the daemon.";
@@ -39,7 +44,7 @@ in
 
       Service = {
         ExecStart =
-          "${cfg.shell} 'exec ${cfg.package}/bin/emacs --fg-daemon ${cfg.extraOptions}'";
+          "${cfg.shell} 'exec ${cfg.package}/bin/emacs --fg-daemon=${cfg.name} ${cfg.extraOptions}'";
         ExecStop = "${cfg.package}/bin/emacsclient --eval '(kill-emacs)'";
         Restart = "on-failure";
       };