diff options
Diffstat (limited to 'users/wpcarro/emacs/.emacs.d')
72 files changed, 28 insertions, 167 deletions
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/>.el b/users/wpcarro/emacs/.emacs.d/wpc/>.el index 68d8576b8079..6d5f86f8b4e6 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/>.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/>.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/al.el b/users/wpcarro/emacs/.emacs.d/wpc/al.el index e29f853f8ea5..3cf98fee296b 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/al.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/al.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/bag.el b/users/wpcarro/emacs/.emacs.d/wpc/bag.el index 38a09d94f900..467e25fceb65 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/bag.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/bag.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/bookmark.el b/users/wpcarro/emacs/.emacs.d/wpc/bookmark.el index 76fc6fe4d75b..eddbbdc799b4 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/bookmark.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/bookmark.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: @@ -59,12 +58,9 @@ Otherwise, open with `counsel-find-file'." (defconst bookmark-whitelist (list - (make-bookmark :label "briefcase" - :path constants-briefcase - :kbd "b") - (make-bookmark :label "current project" - :path constants-current-project - :kbd "p")) + (make-bookmark :label "depot" + :path constants-depot + :kbd "d")) "List of registered bookmarks.") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/users/wpcarro/emacs/.emacs.d/wpc/buffer.el b/users/wpcarro/emacs/.emacs.d/wpc/buffer.el index 3c78601b79f3..c152f53bc658 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/buffer.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/buffer.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/bytes.el b/users/wpcarro/emacs/.emacs.d/wpc/bytes.el index 48d3932f1cf8..b76921d3c755 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/bytes.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/bytes.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/cache.el b/users/wpcarro/emacs/.emacs.d/wpc/cache.el index be2049091c6d..70ebdb71ef85 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/cache.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/cache.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/clipboard.el b/users/wpcarro/emacs/.emacs.d/wpc/clipboard.el index 47cc459061e3..1c14eebae1dc 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/clipboard.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/clipboard.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/colorscheme.el b/users/wpcarro/emacs/.emacs.d/wpc/colorscheme.el index a02dc67c56a9..cc2afd6c5770 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/colorscheme.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/colorscheme.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/constants.el b/users/wpcarro/emacs/.emacs.d/wpc/constants.el index ae21a089cc05..69003f5955c4 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/constants.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/constants.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: @@ -14,42 +13,14 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'prelude) -(require 'f) (require 'maybe) -(prelude-assert (f-exists? (getenv "BRIEFCASE"))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defconst constants-ci? - (maybe-some? (getenv "CI")) +(defconst constants-ci? (maybe-some? (getenv "CI")) "Encoded as t when Emacs is running in CI.") -(defconst constants-briefcase - (getenv "BRIEFCASE") - "Path to my monorepo, which various parts of my configuration rely on.") - -;; TODO: Consider merging `ui.el' and `misc.el' because those are the only -;; current consumers of these constants, and I'm unsure if the indirection that -;; globally defined constants introduces is worth it. - -(defconst constants-current-project - constants-briefcase - "Variable holding the directory for my currently active project.") - -(defconst constants-mouse-kbds - '([mouse-1] [down-mouse-1] [drag-mouse-1] [double-mouse-1] [triple-mouse-1] - [mouse-2] [down-mouse-2] [drag-mouse-2] [double-mouse-2] [triple-mouse-2] - [mouse-3] [down-mouse-3] [drag-mouse-3] [double-mouse-3] [triple-mouse-3] - [mouse-4] [down-mouse-4] [drag-mouse-4] [double-mouse-4] [triple-mouse-4] - [mouse-5] [down-mouse-5] [drag-mouse-5] [double-mouse-5] [triple-mouse-5]) - "All of the mouse-related keybindings that Emacs recognizes.") - -(defconst constants-fill-column 80 - "Variable used to set the defaults for wrapping, highlighting, etc.") - (provide 'constants) ;;; constants.el ends here diff --git a/users/wpcarro/emacs/.emacs.d/wpc/cycle.el b/users/wpcarro/emacs/.emacs.d/wpc/cycle.el index 5ea015930017..e683f3c201cf 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/cycle.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/cycle.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/device.el b/users/wpcarro/emacs/.emacs.d/wpc/device.el index 39df8e11937a..cf693dbb3379 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/device.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/device.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/display.el b/users/wpcarro/emacs/.emacs.d/wpc/display.el index 24c00e3f73ea..42dcb6f214c9 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/display.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/display.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/dotted.el b/users/wpcarro/emacs/.emacs.d/wpc/dotted.el index f400affd6ec6..b824ddbda769 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/dotted.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/dotted.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/email.el b/users/wpcarro/emacs/.emacs.d/wpc/email.el index ef5d7c9534ed..a83ca25e6c17 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/email.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/email.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/fonts.el b/users/wpcarro/emacs/.emacs.d/wpc/fonts.el index ad77b512d78e..196b8828626f 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/fonts.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/fonts.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: @@ -19,7 +18,6 @@ (require 'prelude) (require 'cycle) -(require 'device) (require 'maybe) (require 'cl-lib) @@ -31,11 +29,8 @@ ;; TODO: Consider having a different font size when I'm using my 4K monitor. -(defconst fonts-size - (pcase (device-classify) - ('work-laptop "10") - ('work-desktop "10")) - "My preferred default font-size, which is device specific.") +(defconst fonts-size "10" + "My preferred default font-size.") (defconst fonts-size-step 10 "The amount (%) by which to increase or decrease a font.") diff --git a/users/wpcarro/emacs/.emacs.d/wpc/fs.el b/users/wpcarro/emacs/.emacs.d/wpc/fs.el index 2f83019fd4c9..c303b2353956 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/fs.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/fs.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/functions.el b/users/wpcarro/emacs/.emacs.d/wpc/functions.el index c0b873aaff14..936e25eb2d07 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/functions.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/functions.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/graph.el b/users/wpcarro/emacs/.emacs.d/wpc/graph.el index 9965622bb6d7..1d2f67a4dd66 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/graph.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/graph.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/irc.el b/users/wpcarro/emacs/.emacs.d/wpc/irc.el index f221db9eb9e0..9103bd38fe1a 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/irc.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/irc.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/ivy-clipmenu.el b/users/wpcarro/emacs/.emacs.d/wpc/ivy-clipmenu.el index 9f5b7ca8a0f1..70e68d257cb5 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/ivy-clipmenu.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/ivy-clipmenu.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/ivy-helpers.el b/users/wpcarro/emacs/.emacs.d/wpc/ivy-helpers.el index d13b99353451..3303237d52af 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/ivy-helpers.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/ivy-helpers.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/kbd.el b/users/wpcarro/emacs/.emacs.d/wpc/kbd.el index b456f30cba89..7defc3d08f3b 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/kbd.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/kbd.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el b/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el index 8ffbdea66365..44e0d0706406 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/keybindings.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: @@ -36,7 +35,7 @@ (require 'device) (require 'fonts) (require 'bookmark) -(require 'constants) +(require 'tvl) (require 'window-manager) ;; Note: The following lines must be sorted this way. @@ -222,9 +221,7 @@ "N" #'smerge-next "W" #'balance-windows "gss" #'magit-status - "gsb" (lambda () - (interactive) - (magit-status constants-briefcase)) + "gsd" #'tvl-depot-status "E" #'refine "es" #'functions-create-snippet "l" #'linum-mode diff --git a/users/wpcarro/emacs/.emacs.d/wpc/keyboard.el b/users/wpcarro/emacs/.emacs.d/wpc/keyboard.el index d5a3f92f122b..03fb9e3f3569 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/keyboard.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/keyboard.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/laptop-battery.el b/users/wpcarro/emacs/.emacs.d/wpc/laptop-battery.el index 91b2e3125001..80dc96ebebfe 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/laptop-battery.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/laptop-battery.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/list.el b/users/wpcarro/emacs/.emacs.d/wpc/list.el index cc91ac1eaf60..2f1509eeb4a9 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/list.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/list.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/macros.el b/users/wpcarro/emacs/.emacs.d/wpc/macros.el index 07b88d8f5860..32c9b59dcd50 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/macros.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/macros.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/math.el b/users/wpcarro/emacs/.emacs.d/wpc/math.el index 9f6218fa4930..4013ce3be21d 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/math.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/math.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Containing some useful mathematical functions. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/maybe.el b/users/wpcarro/emacs/.emacs.d/wpc/maybe.el index 270ee909a8e8..ef92e5a4c15c 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/maybe.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/maybe.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Inspired by Elm's Maybe library. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/modeline.el b/users/wpcarro/emacs/.emacs.d/wpc/modeline.el index 6852bb284bc5..df1cddec9d92 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/modeline.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/modeline.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "25.1")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Because I use EXWM, I treat my Emacs mode-line like my system bar: I need to diff --git a/users/wpcarro/emacs/.emacs.d/wpc/prelude.el b/users/wpcarro/emacs/.emacs.d/wpc/prelude.el index 824a80f8047c..4a332cb8ca0e 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/prelude.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/prelude.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.3")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Some of these ideas are scattered across other modules like `fs', diff --git a/users/wpcarro/emacs/.emacs.d/wpc/pulse-audio.el b/users/wpcarro/emacs/.emacs.d/wpc/pulse-audio.el index d22cace46de9..eaa610659073 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/pulse-audio.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/pulse-audio.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Because everything in my configuration is turning into Elisp these days. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/random.el b/users/wpcarro/emacs/.emacs.d/wpc/random.el index aa3c3071bb8f..dfe10b6d47d1 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/random.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/random.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Functions for working with randomness. Some of this code is not as diff --git a/users/wpcarro/emacs/.emacs.d/wpc/region.el b/users/wpcarro/emacs/.emacs.d/wpc/region.el index f915f24ec851..0b692981f899 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/region.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/region.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/scope.el b/users/wpcarro/emacs/.emacs.d/wpc/scope.el index 267baac9fb14..99cdbd2b5e3a 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/scope.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/scope.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/screen-brightness.el b/users/wpcarro/emacs/.emacs.d/wpc/screen-brightness.el index 48aa5d637fb6..851be9f99f80 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/screen-brightness.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/screen-brightness.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/scrot.el b/users/wpcarro/emacs/.emacs.d/wpc/scrot.el index e7231b44fd95..d84a614806c6 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/scrot.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/scrot.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/sequence.el b/users/wpcarro/emacs/.emacs.d/wpc/sequence.el index 9da3ba4575f9..204a72c5b028 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/sequence.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/sequence.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/series.el b/users/wpcarro/emacs/.emacs.d/wpc/series.el index 00be03a976f0..d89003883999 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/series.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/series.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/set.el b/users/wpcarro/emacs/.emacs.d/wpc/set.el index 51c0c434f54e..778b089e156b 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/set.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/set.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/ssh.el b/users/wpcarro/emacs/.emacs.d/wpc/ssh.el index f7d75a27e63e..4e6f8fef75c8 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/ssh.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/ssh.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/stack.el b/users/wpcarro/emacs/.emacs.d/wpc/stack.el index c90f41e7602d..3d1e3e4a169f 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/stack.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/stack.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/string.el b/users/wpcarro/emacs/.emacs.d/wpc/string.el index 9a43f1664501..7e3f10c75adf 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/string.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/string.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/struct.el b/users/wpcarro/emacs/.emacs.d/wpc/struct.el index 35957e834449..eeea04bf26bc 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/struct.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/struct.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24.3")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/symbol.el b/users/wpcarro/emacs/.emacs.d/wpc/symbol.el index 39450caff59e..79d665fa2036 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/symbol.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/symbol.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/timestring.el b/users/wpcarro/emacs/.emacs.d/wpc/timestring.el index a9bf64e9a459..245ace49e75e 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/timestring.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/timestring.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/tree.el b/users/wpcarro/emacs/.emacs.d/wpc/tree.el index ae5fba7950c9..332e6c8d258a 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/tree.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/tree.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/tuple.el b/users/wpcarro/emacs/.emacs.d/wpc/tuple.el index dd8e88f5c34d..848c6fa48b15 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/tuple.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/tuple.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/vector.el b/users/wpcarro/emacs/.emacs.d/wpc/vector.el index 033f8de8347d..6b89708cefcc 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/vector.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/vector.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/vterm-mgt.el b/users/wpcarro/emacs/.emacs.d/wpc/vterm-mgt.el index ce60bab149c0..79a02f98e82a 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/vterm-mgt.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/vterm-mgt.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el b/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el index 0ab5a63d61ea..87ccba1670b3 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/window-manager.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/window.el b/users/wpcarro/emacs/.emacs.d/wpc/window.el index ee3c109b79b4..aec3c7012f8d 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/window.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/window.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-clojure.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-clojure.el index 025ef9aab988..5582641b3f35 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-clojure.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-clojure.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-company.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-company.el index 03535621cf2a..89fde4b6a177 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-company.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-company.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-dired.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-dired.el index bd2805c7369c..6df7ba4106f3 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-dired.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-dired.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "25.1")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-elixir.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-elixir.el index 0b5e3917139e..69259274c86d 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-elixir.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-elixir.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-flycheck.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-flycheck.el index 1f32ce51361e..c32c5daeff13 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-flycheck.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-flycheck.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el index d73249334f89..819ff6ad39b2 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-haskell.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-haskell.el index f9ed8552e0be..af08cf8f0238 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-haskell.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-haskell.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el index da84df66d409..7c1816c561e6 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-lisp.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-lisp.el index f4f8c6931582..4984e5dccddd 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-lisp.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-lisp.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el index db5260fed7bf..ae976d243f72 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "25.1")) -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;;; Commentary: ;; This is the home of any configuration that couldn't find a better home. @@ -17,7 +16,7 @@ (require 'project) (require 'f) (require 'dash) -(require 'constants) +(require 'tvl) (require 'region) (require 'general) @@ -190,7 +189,7 @@ create-lockfiles nil) ;; ensure code wraps at 80 characters by default -(setq-default fill-column constants-fill-column) +(setq-default fill-column 80) (put 'narrow-to-region 'disabled nil) @@ -201,7 +200,10 @@ (add-hook 'after-save-hook (lambda () (when (f-equal? (buffer-file-name) - (f-join constants-briefcase "secrets.json")) + (f-join tvl-depot-path + "users" + "wpcarro" + "secrets.json")) (shell-command "git secret hide")))) ;; use tabs instead of spaces @@ -222,21 +224,21 @@ :config (projectile-mode t)) -;; TODO: Consider moving this into a briefcase.el module. -(defun wpc-misc--briefcase-find (dir) +;; TODO(wpcarro): Consider replacing this with a TVL version if it exists. +(defun wpc-misc--depot-find (dir) "Find the default.nix nearest to DIR." ;; I use 'vc only at the root of my monorepo because 'transient doesn't use my ;; .gitignore, which slows things down. Ideally, I could write a version that ;; behaves like 'transient but also respects my monorepo's .gitignore and any ;; ancestor .gitignore files. - (if (f-equal? constants-briefcase dir) + (if (f-equal? tvl-depot-path dir) (cons 'vc dir) - (when (f-ancestor-of? constants-briefcase dir) + (when (f-ancestor-of? tvl-depot-path dir) (if (f-exists? (f-join dir "default.nix")) (cons 'transient dir) - (wpc-misc--briefcase-find (f-parent dir)))))) + (wpc-misc--depot-find (f-parent dir)))))) -(add-to-list 'project-find-functions #'wpc-misc--briefcase-find) +(add-to-list 'project-find-functions #'wpc-misc--depot-find) (defun wpc-misc-pkill (name) "Call the pkill executable using NAME as its argument." diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-nix.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-nix.el index a555e4621a1f..e9dc203691c2 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-nix.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-nix.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "25.1")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Configuration to support working with Nix. @@ -14,8 +13,7 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(require 'device) -(require 'constants) +(require 'tvl) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Library @@ -24,49 +22,16 @@ (use-package nix-mode :mode "\\.nix\\'") -;; TODO(wpcarro): Ensure the sub-process can resolve <briefcase>. (defun wpc-nix-rebuild-emacs () "Use nix-env to rebuild wpcarros-emacs." (interactive) - (let* ((pname (format "nix-build <briefcase/emacs.nixos>")) + (let* ((pname (format "nix-env -iA users.wpcarro.emacs.nixos")) (bname (format "*%s*" pname))) (start-process pname bname "nix-env" - "-I" (format "briefcase=%s" constants-briefcase) - "-f" "<briefcase>" "-iA" "emacs.nixos") + "-f" tvl-depot-path + "-iA" "users.wpcarro.emacs.nixos") (display-buffer bname))) -(defun wpc-nix-sly-from-briefcase (attr) - "Start a Sly REPL configured using the derivation pointed at by ATTR. - - The derivation invokes nix.buildLisp.sbclWith and is built asynchronously. - The build output is included in the error thrown on build failures." - (interactive "sAttribute: ") - (lexical-let* ((outbuf (get-buffer-create (format "*briefcase-out/%s*" attr))) - (errbuf (get-buffer-create (format "*briefcase-errors/%s*" attr))) - (expression (format "let briefcase = import <briefcase> {}; in briefcase.third_party.depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attr)) - (command (list "nix-build" "-E" expression))) - (message "Acquiring Lisp for <briefcase>.%s" attr) - (make-process :name (format "nix-build/%s" attr) - :buffer outbuf - :stderr errbuf - :command command - :sentinel - (lambda (process event) - (unwind-protect - (pcase event - ("finished\n" - (let* ((outpath (s-trim (with-current-buffer outbuf - (buffer-string)))) - (lisp-path (s-concat outpath "/bin/sbcl"))) - (message "Acquired Lisp for <briefcase>.%s at %s" - attr lisp-path) - (sly lisp-path))) - (_ (with-current-buffer errbuf - (error "Failed to build '%s':\n%s" attr - (buffer-string))))) - (kill-buffer outbuf) - (kill-buffer errbuf)))))) - (provide 'wpc-nix) ;;; wpc-nix.el ends here diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-org.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-org.el index bed4dd067615..229177220b1e 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-org.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-org.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.1")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Hosts my org mode preferences diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-package.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-package.el index 3a363df8ec9b..9c57bb427076 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-package.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-package.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24.1")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; This module hosts all of the settings required to work with ELPA, diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-prolog.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-prolog.el index b891a7df6912..6779431c1215 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-prolog.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-prolog.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Code configuring my Prolog work. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-python.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-python.el index cd30f3ea3739..9ffb7c4c8a2b 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-python.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-python.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; My Python configuration settings diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-rust.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-rust.el index 396d6349ae6a..dfee2fc86b81 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-rust.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-rust.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Supports my Rust work. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-shell.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-shell.el index 855f234b281d..f4229ed328e7 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-shell.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-shell.el @@ -3,7 +3,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 ;; Package-Requires: ((emacs "24")) -;; Homepage: https://user.git.corp.google.com/wpcarro/briefcase ;;; Commentary: ;; Helpers for my shell scripting. Includes bash, zsh, etc. diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el index 40b073746d79..79df8745f6c0 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: @@ -15,6 +14,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (require 'constants) +(require 'tvl) (require 'prelude) (require 'al) (require 'fonts) @@ -71,7 +71,7 @@ (tool-bar-mode -1) ;; set default buffer for Emacs -(setq initial-buffer-choice constants-current-project) +(setq initial-buffer-choice tvl-depot-path) ;; premium Emacs themes (use-package doom-themes @@ -131,13 +131,13 @@ ;; reduce noisiness of auto-revert-mode (setq auto-revert-verbose nil) -;; highlight lines that are over `constants-fill-column' characters long +;; highlight lines that are over 80 characters long (use-package whitespace :config ;; TODO: This should change depending on the language and project. For ;; example, Google Java projects prefer 100 character width instead of 80 ;; character width. - (setq whitespace-line-column constants-fill-column) + (setq whitespace-line-column 80) (setq whitespace-style '(face lines-tail)) (add-hook 'prog-mode-hook #'whitespace-mode)) diff --git a/users/wpcarro/emacs/.emacs.d/wpc/zle.el b/users/wpcarro/emacs/.emacs.d/wpc/zle.el index 0e0baad2d974..d4aa88258fc4 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/zle.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/zle.el @@ -2,7 +2,6 @@ ;; Author: William Carroll <wpcarro@gmail.com> ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: |