From c1e381eeccaa7246ac40e5a58ae5202ead0dfd5f Mon Sep 17 00:00:00 2001 From: William Carroll Date: Thu, 23 Dec 2021 18:30:31 -0500 Subject: refactor(wpcarro): Remove briefcase references TL;DR: - prefer WPCARRO env-var to BRIEFCASE - remove repository URLs from Emacs libraries - prefer tvl-depot-path where possible - reduce the scope of constants.el - prune (some not all) stale CI configuration Change-Id: I21e9130402502ec6fa2fc4b46753c890069be62d Reviewed-on: https://cl.tvl.fyi/c/depot/+/4545 Tested-by: BuildkiteCI Reviewed-by: wpcarro --- users/wpcarro/.envrc | 8 +--- users/wpcarro/Makefile | 4 +- users/wpcarro/README.md | 55 +++++----------------- users/wpcarro/boilerplate/README.md | 2 +- users/wpcarro/boilerplate/clojure/README.md | 2 +- users/wpcarro/ci/pipelines/post-receive.nix | 25 +--------- users/wpcarro/configs/install | 2 +- users/wpcarro/configs/uninstall | 2 +- users/wpcarro/emacs/.emacs.d/wpc/>.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/al.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/bag.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/bookmark.el | 10 ++-- users/wpcarro/emacs/.emacs.d/wpc/buffer.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/bytes.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/cache.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/clipboard.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/colorscheme.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/constants.el | 31 +----------- users/wpcarro/emacs/.emacs.d/wpc/cycle.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/device.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/display.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/dotted.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/email.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/fonts.el | 9 +--- users/wpcarro/emacs/.emacs.d/wpc/fs.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/functions.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/graph.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/irc.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/ivy-clipmenu.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/ivy-helpers.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/kbd.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/keybindings.el | 7 +-- users/wpcarro/emacs/.emacs.d/wpc/keyboard.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/laptop-battery.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/list.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/macros.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/math.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/maybe.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/modeline.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/prelude.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/pulse-audio.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/random.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/region.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/scope.el | 1 - .../emacs/.emacs.d/wpc/screen-brightness.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/scrot.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/sequence.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/series.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/set.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/ssh.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/stack.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/string.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/struct.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/symbol.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/timestring.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/tree.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/tuple.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/vector.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/vterm-mgt.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/window-manager.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/window.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-clojure.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-company.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-dired.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-elixir.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-flycheck.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-golang.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-haskell.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-lisp.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el | 22 +++++---- users/wpcarro/emacs/.emacs.d/wpc/wpc-nix.el | 43 ++--------------- users/wpcarro/emacs/.emacs.d/wpc/wpc-org.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-package.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-prolog.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-python.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-rust.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-shell.el | 1 - users/wpcarro/emacs/.emacs.d/wpc/wpc-ui.el | 8 ++-- users/wpcarro/emacs/.emacs.d/wpc/zle.el | 1 - users/wpcarro/emacs/README.md | 6 +-- users/wpcarro/emacs/default.nix | 13 ++--- users/wpcarro/nixos/marcus/default.nix | 11 ++--- users/wpcarro/tools/monzo_ynab/.envrc | 11 +++-- users/wpcarro/tools/monzo_ynab/README.md | 2 +- users/wpcarro/tools/run/README.md | 2 +- users/wpcarro/tools/symlinkManager/README.md | 4 +- users/wpcarro/tools/url-blocker/README.md | 2 +- users/wpcarro/website/sandbox/contentful/.envrc | 5 +- .../sandbox/learnpianochords/src/server/.envrc | 5 +- 90 files changed, 76 insertions(+), 280 deletions(-) diff --git a/users/wpcarro/.envrc b/users/wpcarro/.envrc index 23adf2d29d..efa3a98b3d 100644 --- a/users/wpcarro/.envrc +++ b/users/wpcarro/.envrc @@ -1,8 +1,4 @@ -export BRIEFCASE="$(realpath .)" -# I'm ensuring that $NIX_PATH is mostly empty, so that I only depend on -# for now. -# For more information on the NIX_PATH anti-pattern, see here: -# https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html#pinning-nixpkgs -export NIX_PATH="briefcase=$BRIEFCASE"; +source_up export DESKTOP="zeno.lon.corp.google.com"; export LAPTOP="seneca"; +export WPCARRO="$REPO_ROOT/users/wpcarro" diff --git a/users/wpcarro/Makefile b/users/wpcarro/Makefile index 6ef5116e3e..52f46d0ea6 100644 --- a/users/wpcarro/Makefile +++ b/users/wpcarro/Makefile @@ -1,8 +1,8 @@ install: - source "${BRIEFCASE}/configs/install" + source "${WPCARRO}/configs/install" uninstall: - source "${BRIEFCASE}/configs/uninstall" + source "${WPCARRO}/configs/uninstall" list-broken-links: find "${HOME}" -maxdepth 1 -xtype l && \ diff --git a/users/wpcarro/README.md b/users/wpcarro/README.md index adfe30ff30..3e945f4605 100644 --- a/users/wpcarro/README.md +++ b/users/wpcarro/README.md @@ -1,8 +1,6 @@ -# briefcase +# wpcarro -[![Build status](https://badge.buildkite.com/aa0d413bfeedcafd8719f977eadd40e04d0b5334fc7f58e8ee.svg)](https://buildkite.com/wpcarros-infrastructure/post-receive) - -Welcome to my monorepo: briefcase. +Welcome to my monorepo. Herein you will find a variety of libraries, packages, and documents. Some of this work in finished and other work is incomplete or just a sketch for a @@ -11,54 +9,23 @@ future project. Where applicable, I try to include `README.md` files in some of the subdirectories to help orient both myself and any onlookers. -## Languages - -To give you a general idea of the source code inside of this monorepo, here is -the latest output from `tokei --hidden --sort code .`: - -```text -------------------------------------------------------------------------------- - Language Files Lines Code Comments Blanks -------------------------------------------------------------------------------- - Emacs Lisp 81 22267 13847 5661 2759 - Python 177 10575 7930 885 1760 - Elm 34 5345 4277 219 849 - Haskell 50 4263 3111 428 724 - Nix 66 1581 1379 66 136 - TypeScript 19 1345 1067 90 188 - Go 17 1256 926 173 157 - Vim Script 2 766 470 87 209 - Elixir 13 358 301 8 49 - JavaScript 9 77 73 0 4 - Lisp 3 83 43 23 17 - Shell 3 55 30 11 14 - Clojure 2 10 8 0 2 - C 1 6 5 0 1 - Rust 1 5 3 1 1 -------------------------------------------------------------------------------- - Total 478 47992 33470 7652 6870 -------------------------------------------------------------------------------- -``` - ## Sign posts -Below I have outlined a few projects that you might find interesting. I am -using `//` to indicate the root of my monorepo, the directory in which this -`README.md` resides. +Below I have outlined a few projects that you might find interesting. -- `//boilerplate`: scaffolding for projects. Boilerplate's goal is to - reduce the startup costs of a project. -- `//configs`: my dotfiles (e.g. `config.fish`, `init.vim`). -- `//emacs`: Emacs is both my preferred text editor and my window manager; with +- `boilerplate`: scaffolding for projects. Boilerplate's goal is to reduce the + startup costs of a project. +- `configs`: my dotfiles (e.g. `config.fish`, `init.vim`). +- `emacs`: Emacs is both my preferred text editor and my window manager; with tens of thousands of lines of Emacs Lisp, you can safely assume that this directory hosts a lot of libraries and packages. -- `//monzo_ynab`: `systemd` timer unit that imports my Monzo (i.e. a U.K.-based +- `monzo_ynab`: `systemd` timer unit that imports my Monzo (i.e. a U.K.-based online bank) transactions into the personal finance tool YNAB (i.e. youneedabudget.com). -- `//nixos`: my declarative configuration for my NixOS machines. If you are +- `nixos`: my declarative configuration for my NixOS machines. If you are unfamiliar with Nix, I recommend reading about the NixOS project. -- `//tools`: some scripts and projects that simplify my life. -- `//website`: everything required to build my website, wpcarro.dev. +- `tools`: some scripts and projects that simplify my life. +- `website`: everything required to build my website, https://wpcarro.dev. ## Notes to self diff --git a/users/wpcarro/boilerplate/README.md b/users/wpcarro/boilerplate/README.md index 0ff4afa5b2..aa72266a33 100644 --- a/users/wpcarro/boilerplate/README.md +++ b/users/wpcarro/boilerplate/README.md @@ -10,7 +10,7 @@ Let's say that you would like to create a game for following: ```shell -$ cp ~/briefcase/boilerplate/typescript ~/briefcase/website/sandbox/game +$ cp -r typescript path/to/new-project ``` This initializes the project. To start developing, run: diff --git a/users/wpcarro/boilerplate/clojure/README.md b/users/wpcarro/boilerplate/clojure/README.md index 2eec7f75e0..53590850bc 100644 --- a/users/wpcarro/boilerplate/clojure/README.md +++ b/users/wpcarro/boilerplate/clojure/README.md @@ -7,7 +7,7 @@ This boilerplate uses `lein` to manage the project. To use this boilerplate, run the following in a shell: ```shell -$ cp ~/briefcase/boilerplate/clojure path/to/new-project +$ cp -r . path/to/new-project ``` After running the above command, change the following files to remove the diff --git a/users/wpcarro/ci/pipelines/post-receive.nix b/users/wpcarro/ci/pipelines/post-receive.nix index ee4850aa8b..64401dee4a 100644 --- a/users/wpcarro/ci/pipelines/post-receive.nix +++ b/users/wpcarro/ci/pipelines/post-receive.nix @@ -15,14 +15,6 @@ let command = "${pkgs.git-secrets}/bin/git-secrets --scan-history"; label = ":broom: lint secrets"; } - { - key = "build-briefcase"; - command = '' - nix-build . -I briefcase="$(pwd)" --no-out-link --show-trace - ''; - label = ":nix: build briefcase"; - depends_on = "lint-secrets"; - } { key = "init-emacs"; command = let @@ -32,25 +24,10 @@ let }; runScriptEl = runScript { script = scriptEl; - briefcasePath = "$(pwd)"; }; in "${runScriptEl} ${initEl}"; label = ":gnu: initialize Emacs"; - depends_on = "build-briefcase"; - } - { - key = "build-socrates"; - command = '' - nix-build '' \ - -I briefcase="$(pwd)" \ - -I nixpkgs=/var/lib/buildkite-agent-socrates/nixpkgs-channels \ - -I nixos-config=nixos/socrates/default.nix \ - -A system \ - --no-out-link \ - --show-trace - ''; - label = ":nix: build socrates"; - depends_on = "build-briefcase"; + depends_on = "lint-secrets"; } ]; in pkgs.writeText "pipeline.yaml" (toJSON pipeline) diff --git a/users/wpcarro/configs/install b/users/wpcarro/configs/install index ec94036823..a3f3ec328e 100755 --- a/users/wpcarro/configs/install +++ b/users/wpcarro/configs/install @@ -1,5 +1,5 @@ #!/usr/bin/env bash -configs="$BRIEFCASE/configs" +configs="$WPCARRO/configs" (cd "$configs" && stow --target="$HOME" .) diff --git a/users/wpcarro/configs/uninstall b/users/wpcarro/configs/uninstall index e082d75cee..9650479c42 100755 --- a/users/wpcarro/configs/uninstall +++ b/users/wpcarro/configs/uninstall @@ -1,5 +1,5 @@ #!/usr/bin/env bash -configs="$BRIEFCASE/configs" +configs="$WPCARRO/configs" (cd "$configs" && stow --delete --target="$HOME" .) diff --git a/users/wpcarro/emacs/.emacs.d/wpc/>.el b/users/wpcarro/emacs/.emacs.d/wpc/>.el index 68d8576b80..6d5f86f8b4 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/>.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/>.el @@ -2,7 +2,6 @@ ;; Author: William Carroll ;; 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 e29f853f8e..3cf98fee29 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 ;; 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 38a09d94f9..467e25fceb 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 ;; 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 76fc6fe4d7..eddbbdc799 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 ;; 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 3c78601b79..c152f53bc6 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 ;; 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 48d3932f1c..b76921d3c7 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 ;; 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 be2049091c..70ebdb71ef 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 ;; 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 47cc459061..1c14eebae1 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 ;; 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 a02dc67c56..cc2afd6c57 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 ;; 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 ae21a089cc..69003f5955 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 ;; 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 5ea0159300..e683f3c201 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 ;; 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 39df8e1193..cf693dbb33 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 ;; 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 24c00e3f73..42dcb6f214 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 ;; 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 f400affd6e..b824ddbda7 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 ;; 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 ef5d7c9534..a83ca25e6c 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 ;; 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 ad77b512d7..196b882862 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 ;; 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 2f83019fd4..c303b23539 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 ;; 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 c0b873aaff..936e25eb2d 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 ;; 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 9965622bb6..1d2f67a4dd 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 ;; 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 f221db9eb9..9103bd38fe 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 ;; 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 9f5b7ca8a0..70e68d257c 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 ;; 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 d13b993534..3303237d52 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 ;; 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 b456f30cba..7defc3d08f 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 ;; 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 8ffbdea663..44e0d07064 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 ;; 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 d5a3f92f12..03fb9e3f35 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 ;; 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 91b2e31250..80dc96ebeb 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 ;; 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 cc91ac1eaf..2f1509eeb4 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 ;; 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 07b88d8f58..32c9b59dcd 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 ;; 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 9f6218fa49..4013ce3be2 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 ;; 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 270ee909a8..ef92e5a4c1 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 ;; 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 6852bb284b..df1cddec9d 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 ;; 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 824a80f804..4a332cb8ca 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 ;; 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 d22cace46d..eaa6106590 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 ;; 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 aa3c3071bb..dfe10b6d47 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 ;; 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 f915f24ec8..0b692981f8 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 ;; 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 267baac9fb..99cdbd2b5e 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 ;; 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 48aa5d637f..851be9f99f 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 ;; 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 e7231b44fd..d84a614806 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 ;; 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 9da3ba4575..204a72c5b0 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 ;; 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 00be03a976..d890038839 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 ;; 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 51c0c434f5..778b089e15 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 ;; 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 f7d75a27e6..4e6f8fef75 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 ;; 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 c90f41e760..3d1e3e4a16 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 ;; 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 9a43f16645..7e3f10c75a 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 ;; 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 35957e8344..eeea04bf26 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 ;; 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 39450caff5..79d665fa20 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 ;; 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 a9bf64e9a4..245ace49e7 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 ;; 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 ae5fba7950..332e6c8d25 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 ;; 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 dd8e88f5c3..848c6fa48b 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 ;; 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 033f8de834..6b89708cef 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 ;; 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 ce60bab149..79a02f98e8 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 ;; 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 0ab5a63d61..87ccba1670 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 ;; 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 ee3c109b79..aec3c7012f 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 ;; 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 025ef9aab9..5582641b3f 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 ;; 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 03535621cf..89fde4b6a1 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 ;; 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 bd2805c736..6df7ba4106 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 ;; 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 0b5e391713..69259274c8 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 ;; 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 1f32ce5136..c32c5daeff 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 ;; 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 d73249334f..819ff6ad39 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 ;; 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 f9ed8552e0..af08cf8f02 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 ;; 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 da84df66d4..7c1816c561 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 ;; 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 f4f8c69315..4984e5dccd 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 ;; 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 db5260fed7..ae976d243f 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 ;; 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 a555e4621a..e9dc203691 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 ;; 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 . (defun wpc-nix-rebuild-emacs () "Use nix-env to rebuild wpcarros-emacs." (interactive) - (let* ((pname (format "nix-build ")) + (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" "" "-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 {}; in briefcase.third_party.depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attr)) - (command (list "nix-build" "-E" expression))) - (message "Acquiring Lisp for .%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 .%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 bed4dd0676..229177220b 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 ;; 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 3a363df8ec..9c57bb4270 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 ;; 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 b891a7df69..6779431c12 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 ;; 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 cd30f3ea37..9ffb7c4c8a 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 ;; 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 396d6349ae..dfee2fc86b 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 ;; 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 855f234b28..f4229ed328 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 ;; 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 40b073746d..79df8745f6 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 ;; 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 0e0baad2d9..d4aa88258f 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 ;; Version: 0.0.1 -;; URL: https://git.wpcarro.dev/wpcarro/briefcase ;; Package-Requires: ((emacs "24")) ;;; Commentary: diff --git a/users/wpcarro/emacs/README.md b/users/wpcarro/emacs/README.md index b4b16b3285..1ed6634e06 100644 --- a/users/wpcarro/emacs/README.md +++ b/users/wpcarro/emacs/README.md @@ -5,9 +5,9 @@ as central to my workflow as `git` and `nix`. ## Installing -If you already have `briefcase` on your local file system, run the following -from the top-level `briefcase` directory: +If you already have `depot` on your local file system, run the following from +the top-level `depot` directory: ```shell -$ nix-build -f . -iA emacs.nixos +$ nix-env -iA users.wpcarro.emacs.nixos ``` diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index d95f5fa271..f19306c461 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -154,10 +154,9 @@ let "${wpcarrosEmacs.deps}/share/emacs/site-lisp:" ]; - withEmacsPath = { emacsBin, briefcasePath ? "$HOME/briefcase" }: + withEmacsPath = { emacsBin }: writeShellScriptBin "wpcarros-emacs" '' export XMODIFIERS=emacs - export BRIEFCASE=${briefcasePath} export GOOGLE_BRIEFCASE="$HOME/google-briefcase" export PATH="${emacsBinPath}:$PATH" export EMACSLOADPATH="${loadPath}" @@ -173,9 +172,8 @@ in { inherit initEl withEmacsPath; # I need to start my Emacs from CI without the call to `--load ${initEl}`. - runScript = { script, briefcasePath }: + runScript = { script }: writeShellScript "run-emacs-script" '' - export BRIEFCASE=${briefcasePath} export PATH="${emacsBinPath}:$PATH" export EMACSLOADPATH="${wpcDir}:${vendorDir}:${wpcarrosEmacs.deps}/share/emacs/site-lisp" exec ${wpcarrosEmacs}/bin/emacs \ @@ -186,10 +184,9 @@ in { "$@" ''; - # Use `nix-env -f '' emacs.nixos` to install `wpcarros-emacs` on - # NixOS machines. - nixos = { briefcasePath ? "$HOME/briefcase" }: withEmacsPath { - inherit briefcasePath; + nixos = withEmacsPath { emacsBin = "${wpcarrosEmacs}/bin/emacs"; }; + + meta.targets = [ "nixos" ]; } diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 53132c2d1e..e1e6bc8437 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -1,11 +1,8 @@ { depot, pkgs, lib, ... }: -{ config, ... }: +{ ... }: let - # TODO(wpcarro): Drop dependency on the briefcase concept. - wpcarros-emacs = depot.users.wpcarro.emacs.nixos { - briefcasePath = "$HOME/depot/users/wpcarro"; - }; + wpcarrosEmacs = depot.users.wpcarro.emacs.nixos; in { imports = [ (depot.path + "/users/wpcarro/nixos/marcus/hardware.nix") @@ -54,7 +51,7 @@ in { ''; windowManager.session = lib.singleton { name = "exwm"; - start = "${wpcarros-emacs}/bin/wpcarros-emacs"; + start = "${wpcarrosEmacs}/bin/wpcarros-emacs"; }; }; @@ -127,7 +124,7 @@ in { tdesktop vim weechat - wpcarros-emacs + wpcarrosEmacs xclip xsecurelock ]; diff --git a/users/wpcarro/tools/monzo_ynab/.envrc b/users/wpcarro/tools/monzo_ynab/.envrc index f368d0b7e8..2e3b53cd61 100644 --- a/users/wpcarro/tools/monzo_ynab/.envrc +++ b/users/wpcarro/tools/monzo_ynab/.envrc @@ -1,8 +1,9 @@ source_up use_nix -export monzo_client_id="$(jq -j '.monzo | .clientId' < ~/briefcase/secrets.json)" -export monzo_client_secret="$(jq -j '.monzo | .clientSecret' < ~/briefcase/secrets.json)" -export ynab_personal_access_token="$(jq -j '.ynab | .personalAccessToken' < ~/briefcase/secrets.json)" -export ynab_account_id="$(jq -j '.ynab | .accountId' < ~/briefcase/secrets.json)" -export ynab_budget_id="$(jq -j '.ynab | .budgetId' < ~/briefcase/secrets.json)" +# TODO(wpcarro): Prefer age-nix solution if possible. +export monzo_client_id="$(jq -j '.monzo | .clientId' < $WPCARRO/secrets.json)" +export monzo_client_secret="$(jq -j '.monzo | .clientSecret' < $WPCARRO/secrets.json)" +export ynab_personal_access_token="$(jq -j '.ynab | .personalAccessToken' < $WPCARRO/secrets.json)" +export ynab_account_id="$(jq -j '.ynab | .accountId' < $WPCARRO/secrets.json)" +export ynab_budget_id="$(jq -j '.ynab | .budgetId' < $WPCARRO/secrets.json)" export store_path="$(pwd)" diff --git a/users/wpcarro/tools/monzo_ynab/README.md b/users/wpcarro/tools/monzo_ynab/README.md index 4ccbb35d8c..c0c0c772f6 100644 --- a/users/wpcarro/tools/monzo_ynab/README.md +++ b/users/wpcarro/tools/monzo_ynab/README.md @@ -24,7 +24,7 @@ Or you can install using `nix-env` if you'd like to create the `monzo_ynab` symlink. ```shell -> nix-env -f ~/briefcase/monzo_ynab -i +> nix-env -iA users.wpcarro.monzo_ynab ``` ## Deployment diff --git a/users/wpcarro/tools/run/README.md b/users/wpcarro/tools/run/README.md index d3cccecf91..fd24495035 100644 --- a/users/wpcarro/tools/run/README.md +++ b/users/wpcarro/tools/run/README.md @@ -26,5 +26,5 @@ file.ts` will run. Install `run` using Nix. ```shell -> nix-env -iA briefcase.run +> nix-env -iA users.wpcarro.run ``` diff --git a/users/wpcarro/tools/symlinkManager/README.md b/users/wpcarro/tools/symlinkManager/README.md index b0fc58c8e9..e8298ea654 100644 --- a/users/wpcarro/tools/symlinkManager/README.md +++ b/users/wpcarro/tools/symlinkManager/README.md @@ -1,6 +1,6 @@ # Dotfile Symlink Manager -Find and delete all symlinks to the dotfiles defined in `$BRIEFCASE`. +Find and delete all symlinks to my dotfiles. Oftentimes I corrupt the state of my configuration files. The intention with this script is to help me clean things up when this happens. An example workflow @@ -9,6 +9,4 @@ might look like: ```shell > symlink-mgr --audit > symlink-mgr --seriously -> briefcase # changes directory to $BRIEFCASE -> make install ``` diff --git a/users/wpcarro/tools/url-blocker/README.md b/users/wpcarro/tools/url-blocker/README.md index 1b7fea8c15..a6063f3256 100644 --- a/users/wpcarro/tools/url-blocker/README.md +++ b/users/wpcarro/tools/url-blocker/README.md @@ -36,7 +36,7 @@ file `~/.config/url-blocker/rules.json` with the following contents and ## Installation ```shell -$ nix-env -iA 'briefcase.tools.url-blocker' +$ nix-env -iA users.wpcarro.tools.url-blocker ``` ## How does it work? diff --git a/users/wpcarro/website/sandbox/contentful/.envrc b/users/wpcarro/website/sandbox/contentful/.envrc index 848d74e8b5..e9d0356aaa 100644 --- a/users/wpcarro/website/sandbox/contentful/.envrc +++ b/users/wpcarro/website/sandbox/contentful/.envrc @@ -1,4 +1,5 @@ source_up use_nix -export CONTENTFUL_SPACE_ID="$(jq -j '.contentful | .spaceId' < ~/briefcase/secrets.json)" -export CONTENTFUL_ACCESS_TOKEN="$(jq -j '.contentful | .accessToken' < ~/briefcase/secrets.json)" +# TODO(wpcarro): Prefer age-nix solution if possible. +export CONTENTFUL_SPACE_ID="$(jq -j '.contentful | .spaceId' < $WPCARRO/secrets.json)" +export CONTENTFUL_ACCESS_TOKEN="$(jq -j '.contentful | .accessToken' < $WPCARRO/secrets.json)" diff --git a/users/wpcarro/website/sandbox/learnpianochords/src/server/.envrc b/users/wpcarro/website/sandbox/learnpianochords/src/server/.envrc index db08eac38e..9e714732fe 100644 --- a/users/wpcarro/website/sandbox/learnpianochords/src/server/.envrc +++ b/users/wpcarro/website/sandbox/learnpianochords/src/server/.envrc @@ -2,5 +2,6 @@ source_up use_nix export SERVER_PORT=3000 export CLIENT_PORT=8000 -export GOOGLE_CLIENT_ID="$(jq -j '.google | .clientId' < ~/briefcase/secrets.json)" -export STRIPE_API_KEY="$(jq -j '.stripe | .apiKey' < ~/briefcase/secrets.json)" +# TODO(wpcarro): Prefer age-nix solution if possible. +export GOOGLE_CLIENT_ID="$(jq -j '.google | .clientId' < $WPCARRO/secrets.json)" +export STRIPE_API_KEY="$(jq -j '.stripe | .apiKey' < $WPCARRO/secrets.json)" -- cgit 1.4.1