From 9f325f01bf80dcabdbd743421645a12064a4373d Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sat, 30 Jul 2022 11:05:31 -0700 Subject: refactor(wpcarro/emacs): Drop support for functions.el This was one of my original dumping grounds for Elisp functions. Nice to demolish it. Change-Id: I18102f04690131e66ec0d4362f8305e56e7a6ed7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6015 Tested-by: BuildkiteCI Reviewed-by: wpcarro Autosubmit: wpcarro --- users/wpcarro/emacs/.emacs.d/wpc/functions.el | 46 -------------------- users/wpcarro/emacs/.emacs.d/wpc/keybindings.el | 57 +++++++++++++++++-------- 2 files changed, 39 insertions(+), 64 deletions(-) delete mode 100644 users/wpcarro/emacs/.emacs.d/wpc/functions.el (limited to 'users/wpcarro/emacs/.emacs.d') diff --git a/users/wpcarro/emacs/.emacs.d/wpc/functions.el b/users/wpcarro/emacs/.emacs.d/wpc/functions.el deleted file mode 100644 index 936e25eb2d07..000000000000 --- a/users/wpcarro/emacs/.emacs.d/wpc/functions.el +++ /dev/null @@ -1,46 +0,0 @@ -;;; functions.el --- Helper functions -*- lexical-binding: t -*- - -;; Author: William Carroll -;; Version: 0.0.1 -;; Package-Requires: ((emacs "24")) - -;;; Commentary: -;; This file hopefully contains friendly APIs that making ELisp development more -;; enjoyable. - -;; TODO: Break these out into separate modules. - -;;; Code: -(defun functions-evil-window-vsplit-right () - "Split the window vertically and focus the right half." - (interactive) - (evil-window-vsplit) - (windmove-right)) - -(defun functions-evil-window-split-down () - "Split the window horizontal and focus the bottom half." - (interactive) - (evil-window-split) - (windmove-down)) - -(defun functions-create-snippet () - "Create a window split and then opens the Yasnippet editor." - (interactive) - (evil-window-vsplit) - (call-interactively #'yas-new-snippet)) - -(defun functions-evil-replace-under-point () - "Faster than typing %s//thing/g." - (interactive) - (let ((term (s-replace "/" "\\/" (symbol-to-string (symbol-at-point))))) - (save-excursion - (evil-ex (concat "%s/\\b" term "\\b/"))))) - -(defun functions-buffer-dirname () - "Return the directory name of the current buffer as a string." - (->> buffer-file-name - f-dirname - f-filename)) - -(provide 'functions) -;;; functions.el ends here diff --git a/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el b/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el index ca9ba16271b8..75ac95611f5d 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el @@ -21,7 +21,6 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'functions) (require 'screen-brightness) (require 'pulse-audio) (require 'scrot) @@ -51,6 +50,41 @@ (require 'edebug) (require 'avy) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Helper Functions +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun keybindings--window-vsplit-right () + "Split the window vertically and focus the right half." + (interactive) + (evil-window-vsplit) + (windmove-right)) + +(defun keybindings--window-split-down () + "Split the window horizontal and focus the bottom half." + (interactive) + (evil-window-split) + (windmove-down)) + +(defun keybindings--create-snippet () + "Create a window split and then opens the Yasnippet editor." + (interactive) + (evil-window-vsplit) + (call-interactively #'yas-new-snippet)) + +(defun keybindings--replace-under-point () + "Faster than typing %s//thing/g." + (interactive) + (let ((term (s-replace "/" "\\/" (symbol-to-string (symbol-at-point))))) + (save-excursion + (evil-ex (concat "%s/\\b" term "\\b/"))))) + +(defun keybindings--evil-ex-define-cmd-local (cmd f) + "Define CMD to F locally to a buffer." + (unless (local-variable-p 'evil-ex-commands) + (setq-local evil-ex-commands (copy-alist evil-ex-commands))) + (evil-ex-define-cmd cmd f)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; General Keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -78,10 +112,10 @@ "L" #'evil-end-of-line "_" #'ranger "-" #'dired-jump - "sl" #'functions-evil-window-vsplit-right + "sl" #'keybindings--window-vsplit-right "sh" #'evil-window-vsplit "sk" #'evil-window-split - "sj" #'functions-evil-window-split-down) + "sj" #'keybindings--window-split-down) (general-nmap :keymaps 'override @@ -228,11 +262,11 @@ "gss" #'magit-status "gsd" #'tvl-depot-status "E" #'refine - "es" #'functions-create-snippet + "es" #'keybindings--create-snippet "l" #'linum-mode "B" #'magit-blame "w" #'save-buffer - "r" #'functions-evil-replace-under-point + "r" #'keybindings--replace-under-point "R" #'deadgrep) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -278,19 +312,6 @@ "" #'notmuch-show-next-thread-show "e" #'notmuch-show-archive-message-then-next-or-next-thread) -;; TODO(wpcarro): Consider moving this to a separate module -(defun keybindings--evil-ex-define-cmd-local (cmd f) - "Define CMD to F locally to a buffer." - (unless (local-variable-p 'evil-ex-commands) - (setq-local evil-ex-commands (copy-alist evil-ex-commands))) - (evil-ex-define-cmd cmd f)) - -;; TODO(wpcarro): Support a macro that can easily define evil-ex commands for a -;; particular mode. -;; Consumption: -;; (evil-ex-for-mode 'notmuch-message-mode -;; "x" #'notmuch-mua-send-and-exit) - (add-hook 'notmuch-message-mode-hook (lambda () (keybindings--evil-ex-define-cmd-local "x" #'notmuch-mua-send-and-exit))) -- cgit 1.4.1