home

commit 3e7fd43ddf98e56cfe768b6dad093da14e99c26f
parent 91a91ebb46393bd0649fc2207938c4c00736ac67
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 24 Jul 2020 19:02:53 +0200

users/vincent: update emacs.nix…

… from tangle file (emacs.org in my notes).

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

Diffstat:
D
pkgs/scripts/bin/e
 | 
3
---
D
pkgs/scripts/bin/ec
 | 
2
--
D
pkgs/scripts/bin/et
 | 
2
--
M
pkgs/scripts/default.nix
 | 
2
+-
M
users/vincent/dev/emacs.nix
 | 
23
+++++++++++++++++++----

5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/pkgs/scripts/bin/e b/pkgs/scripts/bin/e
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-emacs --dump-file=${HOME}/.config/emacs/emacs.pdmp-
\ No newline at end of file
diff --git a/pkgs/scripts/bin/ec b/pkgs/scripts/bin/ec
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-emacsclient -s ${XDG_RUNTIME_DIR}/emacs/org --create-frame $@
diff --git a/pkgs/scripts/bin/et b/pkgs/scripts/bin/et
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-emacsclient -s ${XDG_RUNTIME_DIR}/emacs/org --tty $@
diff --git a/pkgs/scripts/default.nix b/pkgs/scripts/default.nix
@@ -1,7 +1,7 @@
 { stdenv }:
 
 stdenv.mkDerivation {
-  name = "vde-scripts-0.2";
+  name = "vde-scripts-0.3";
   builder = ./builder.sh;
   src = ./.;
 }
diff --git a/users/vincent/dev/emacs.nix b/users/vincent/dev/emacs.nix
@@ -6,6 +6,18 @@ let
     #!${pkgs.stdenv.shell}
     emacsclient -s /run/user/1000/emacs/org -n -F '((name . "capture") (width . 150) (height . 90))' -e '(org-capture)'
   '';
+  e = pkgs.writeScriptBin "e" ''
+    #!${pkgs.stdenv.shell}
+    emacs --dump-file=~/.config/emacs/emacs.pdmp
+  '';
+  et = pkgs.writeScriptBin "et" ''
+    #!${pkgs.stdenv.shell}
+    emacsclient -s /run/user/1000/emacs/org --tty $@
+  '';
+  ec = pkgs.writeScriptBin "ec" ''
+    #!${pkgs.stdenv.shell}
+    emacsclient -s /run/user/1000/emacs/org --create-frame $@
+  '';
   myExtraPackages = epkgs: with epkgs; [
     ace-window
     aggressive-indent
@@ -121,16 +133,15 @@ in
     zip
     # See if I can hide this under an option
     capture
+    e
+    ec
+    et
   ];
   programs.emacs = {
     enable = true;
     package = pkgs.my.emacs;
     extraPackages = myExtraPackages;
   };
-  home.sessionVariables = {
-    EDITOR = "et";
-    ALTERNATE_EDITOR = "et";
-  };
   services.emacs-server = {
     enable = true;
     package = pkgs.my.emacs;
@@ -139,4 +150,8 @@ in
     # FIXME do this in the derivation :)
     # extraOptions = "--dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp";
   };
+  home.sessionVariables = {
+    EDITOR = "et";
+    ALTERNATE_EDITOR = "et";
+  };
 }