From 3ebd71dfa2873a6aff6259ed74b2abd80d93de97 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Thu, 4 Aug 2022 14:27:28 -0700 Subject: refactor(wpcarro/emacs): Remove vterm-mgt.el's dep on dash.el TIL (or remembered rather) `seq.el` exists Change-Id: Iec5c21aff7a76906cb24d03bf39bf03f94b67760 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6037 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/emacs/pkgs/vterm-mgt/default.nix | 33 +++++++++++++------------ users/wpcarro/emacs/pkgs/vterm-mgt/vterm-mgt.el | 13 ++++------ 2 files changed, 22 insertions(+), 24 deletions(-) (limited to 'users/wpcarro/emacs/pkgs') diff --git a/users/wpcarro/emacs/pkgs/vterm-mgt/default.nix b/users/wpcarro/emacs/pkgs/vterm-mgt/default.nix index c97e54e719a2..88eb5502042a 100644 --- a/users/wpcarro/emacs/pkgs/vterm-mgt/default.nix +++ b/users/wpcarro/emacs/pkgs/vterm-mgt/default.nix @@ -1,18 +1,19 @@ { pkgs, depot, ... }: -pkgs.callPackage - ({ emacsPackages }: - emacsPackages.trivialBuild { - pname = "vterm-mgt"; - version = "1.0.0"; - src = ./vterm-mgt.el; - packageRequires = - (with emacsPackages; [ - dash - vterm - ]) ++ - (with depot.users.wpcarro.emacs.pkgs; [ - cycle - ]); - }) -{ } +pkgs.emacsPackages.trivialBuild { + pname = "vterm-mgt"; + version = "1.0.0"; + src = ./vterm-mgt.el; + packageRequires = + (with pkgs.emacsPackages; [ + vterm + ]) ++ + (with depot.users.wpcarro.emacs.pkgs; [ + cycle + ]); + passthru.meta.ci.extraSteps.github = depot.tools.releases.filteredGitPush { + filter = ":/users/wpcarro/emacs/pkgs/vterm-mgt"; + remote = "git@github.com:wpcarro/vterm-mgt.el.git"; + ref = "refs/heads/canon"; + }; +} diff --git a/users/wpcarro/emacs/pkgs/vterm-mgt/vterm-mgt.el b/users/wpcarro/emacs/pkgs/vterm-mgt/vterm-mgt.el index 29c24d89ec9c..fe161fc6fbff 100644 --- a/users/wpcarro/emacs/pkgs/vterm-mgt/vterm-mgt.el +++ b/users/wpcarro/emacs/pkgs/vterm-mgt/vterm-mgt.el @@ -22,16 +22,17 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'dash) (require 'cycle) (require 'vterm) +(require 'seq) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup vterm-mgt nil - "Customization options for `vterm-mgt'.") + "Customization options for `vterm-mgt'." + :group 'vterm) (defcustom vterm-mgt-scroll-on-focus nil "When t, call `end-of-buffer' after focusing a vterm instance." @@ -124,9 +125,7 @@ If for whatever reason, the state of `vterm-mgt--instances' is corrupted and restore the state." (interactive) (setq vterm-mgt--instances - (->> (buffer-list) - (-filter #'vterm-mgt--instance?) - cycle-from-list))) + (cycle-from-list (seq-filter #'vterm-mgt--instance? (buffer-list))))) (defun vterm-mgt-select () "Select a vterm instance by name from the list in `vterm-mgt--instances'." @@ -134,9 +133,7 @@ If for whatever reason, the state of `vterm-mgt--instances' is corrupted and (vterm-mgt-reconcile-state) (switch-to-buffer (completing-read "Switch to vterm: " - (->> vterm-mgt--instances - cycle-to-list - (-map #'buffer-name))))) + (seq-map #'buffer-name (cycle-to-list vterm-mgt--instances))))) (provide 'vterm-mgt) ;;; vterm-mgt.el ends here -- cgit 1.4.1