about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-07-22T02·55-0700
committerclbot <clbot@tvl.fyi>2022-07-28T13·40+0000
commitebbda2484a47054aa16946d40c10130608c6e15a (patch)
tree334b7c97d88576256731196ce54f338cca01d5f7 /users
parent3ecf0b9d6997bc85ae712650629adb6a3ab59909 (diff)
feat(wpcarro/emacs): Package zle.el r/4333
The end-goal is to package all of my Elisp libraries. Why?
- More granular builds/tests
- More explicitly defined dependencies
- Separate personal configuration from library code
- Ease distribution

Change-Id: I2507d129d3a0b3bf0cfe70b9790536a8b2093b96
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5969
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users')
-rw-r--r--users/wpcarro/emacs/default.nix4
-rw-r--r--users/wpcarro/emacs/pkgs/zle/default.nix10
-rw-r--r--users/wpcarro/emacs/pkgs/zle/zle.el (renamed from users/wpcarro/emacs/.emacs.d/wpc/zle.el)11
3 files changed, 19 insertions, 6 deletions
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix
index c6e6e913a002..6607b668d5a5 100644
--- a/users/wpcarro/emacs/default.nix
+++ b/users/wpcarro/emacs/default.nix
@@ -24,6 +24,10 @@ let
   emacsWithPackages = (emacsPackagesFor emacs28).emacsWithPackages;
 
   wpcarrosEmacs = emacsWithPackages (epkgs:
+    (with wpcarro.emacs.pkgs; [
+      zle
+    ]) ++
+
     (with epkgs.tvlPackages; [
       tvl
     ]) ++
diff --git a/users/wpcarro/emacs/pkgs/zle/default.nix b/users/wpcarro/emacs/pkgs/zle/default.nix
new file mode 100644
index 000000000000..9d4820a9445e
--- /dev/null
+++ b/users/wpcarro/emacs/pkgs/zle/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+pkgs.callPackage
+  ({ emacsPackages }:
+  emacsPackages.trivialBuild {
+    pname = "zle";
+    version = "1.0.0";
+    src = ./zle.el;
+  })
+{ }
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/zle.el b/users/wpcarro/emacs/pkgs/zle/zle.el
index d4aa88258fc4..21a6e35f13d3 100644
--- a/users/wpcarro/emacs/.emacs.d/wpc/zle.el
+++ b/users/wpcarro/emacs/pkgs/zle/zle.el
@@ -72,12 +72,11 @@
 
 (defvar zle-kbds
   (let ((map (make-sparse-keymap)))
-    (bind-keys :map map
-               ("C-j"   . zle-subshell)
-               ("C-v"   . zle-variable)
-               ("C-M--" . zle-dash-dash)
-               ("M-'"   . zle-single-quote)
-               ("M-\""  . zle-double-quote))
+    (define-key map (kbd "C-j") #'zle-subshell)
+    (define-key map (kbd "C-v") #'zle-variable)
+    (define-key map (kbd "C-M--") #'zle-dash-dash)
+    (define-key map (kbd "M-'") #'zle-single-quote)
+    (define-key map (kbd "M-\"") #'zle-double-quote)
     map)
   "Keybindings shaving milliseconds off of typing.")