home

commit 4ba4dd1665c24cdc815a519ce3615794d40c12c3
parent c231a8332cca2fbc6da18b03fe4a9ba1544649af
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 17 Apr 2020 20:08:11 +0200

emacs.nix: use server name for the daemon…

… and use the dump file.

Apr 17 20:02:28 wakasu bash[26459]: Loading /home/vincent/.config/emacs/init.el...done (0.099s) [after-init]

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
modules/profiles/assets/xorg/org-protocol.desktop
 | 
2
+-
M
modules/profiles/emacs.nix
 | 
2
+-
M
pkgs/scripts/bin/ec
 | 
3
+--
M
pkgs/scripts/bin/et
 | 
3
+--

4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/modules/profiles/assets/xorg/org-protocol.desktop b/modules/profiles/assets/xorg/org-protocol.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=org-protocol
-Exec=emacsclient -n %u
+Exec=emacsclient -s /run/user/1000/emacs/org -n %u
 Type=Application
 Terminal=false
 Categories=System;
diff --git a/modules/profiles/emacs.nix b/modules/profiles/emacs.nix
@@ -185,7 +185,7 @@ in
                 PATH=${config.home.homeDirectory}/.nix-profile/bin:${config.home.homeDirectory}/.local/npm/bin:/run/wrappers/bin:/etc/profiles/per-user/vincent/bin:${config.home.profileDirectory}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/share/Modules/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:${config.home.homeDirectory}/bin GOPATH=${config.home.homeDirectory} NIX_PATH=${config.home.homeDirectory}/.nix-defexpr/channels:nixpkgs=/home/vincent/.nix-defexpr/channels/nixpkgs ASPELL_CONF=dict-dir=${config.home.homeDirectory}/.nix-profile/lib/aspell SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
               '';
               Type = "forking";
-              ExecStart = "${pkgs.bash}/bin/bash -c 'source /etc/profile; exec ${config.home.homeDirectory}/.nix-profile/bin/emacs --daemon'";
+              ExecStart = "${pkgs.bash}/bin/bash -c 'source /etc/profile; exec ${config.home.homeDirectory}/.nix-profile/bin/emacs --dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp --daemon=org'";
               ExecStop = "${config.home.homeDirectory}/.nix-profile/bin/emacsclient --eval (kill-emacs)";
               Restart = "always";
             };
diff --git a/pkgs/scripts/bin/ec b/pkgs/scripts/bin/ec
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-emacsclient --create-frame $@-
\ No newline at end of file
+emacsclient -s ${XDG_RUNTIME_DIR}/emacs/org --create-frame $@
diff --git a/pkgs/scripts/bin/et b/pkgs/scripts/bin/et
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-emacsclient --tty $@-
\ No newline at end of file
+emacsclient -s ${XDG_RUNTIME_DIR}/emacs/org --tty $@