Rename dotfiles -> briefcase

Renaming my mono-repo briefcase.

I first introduced this commit in master, but it introduced a bug where one of
two things would happen:

1. Emacs wouldn't start and would crash X.
2. Emacs would start but my keyboard wouldn't work.

I learned some valuable debugging skills in the process. Here are some of them:

When my keyboard was broken, I wanted to control my computer using my
laptop. Thankfully this is possible by using `x2x`, which forward X events from
the SSH client to the SSH host.

```shell
> # I'm unsure if this is the *exact* command
> ssh -X desktop x2x -west :0.0
```

Git commit-local bisecting. I didn't need to do a `git bisect` because I knew
which commit introduced the bug; it was HEAD, master. But -- as you can see from
the size of this commit -- there are many changes involved. I wanted to binary
search through the changes, so I did the following workflow using `magit`:

- git reset --soft HEAD^
- git stash 1/2 of the files changed
- re-run `nix-env -f ~/briefcase/emacs -i`
- restart X session
- If the problem persists, the bug exists in the non-stashed files. Repeat the
  process until you find the bug.

In my case, the bug was pretty benign. Calling `(exwm/switch "Dotfiles")` at the
bottom of `window-manager.el` was failing because "Dotfiles" is the name of a
non-existent workspace; it should've been `(exwm/switch "Briefcase")`.

There may have been more problems. I changed a few other things along the way,
including exposing the env vars BRIEFCASE to `wpcarros-emacs` inside of
`emacs/default.nix`.

The important part is that this was a valuable learning opportunity, and I'm
glad that I'm walking away from the two days of "lost productivity" feeling
actually productive.
This commit is contained in:
William Carroll 2020-01-31 15:27:48 +00:00
parent a65b895c8e
commit 837cfe07c7
20 changed files with 60 additions and 59 deletions

6
.envrc
View file

@ -1,5 +1,7 @@
export DOTFILES=~/dotfiles export BRIEFCASE=~/briefcase
export DEPOT=~/depot
export NIXPKGS=$HOME/nixpkgs
export DESKTOP=zeno.lon.corp.google.com export DESKTOP=zeno.lon.corp.google.com
export LAPTOP=seneca export LAPTOP=seneca
export CLOUDTOP=wpcarro.c.googlers.com export CLOUDTOP=wpcarro.c.googlers.com
NIX_PATH=nixpkgs=$HOME/nixpkgs:depot=$HOME/depot:universe=$HOME/universe NIX_PATH=nixpkgs=$NIXPKGS:depot=$DEPOT:briefcase=$BRIEFCASE

View file

@ -1,8 +1,8 @@
install: install:
source "${DOTFILES}/configs/install" source "${BRIEFCASE}/configs/install"
uninstall: uninstall:
source "${DOTFILES}/configs/uninstall" source "${BRIEFCASE}/configs/uninstall"
list-broken-links: list-broken-links:
find "${HOME}" -maxdepth 1 -xtype l && \ find "${HOME}" -maxdepth 1 -xtype l && \

View file

@ -1,17 +1,16 @@
# dotfiles # briefcase
This is my mono-repo. Having a personal mono-repo is a new idea for me, so at Welcome to my briefcase: my monorepo.
the time of this writing, the state of this repository is fledgling.
I'm attempting to amass a collection of functions across a variety of languages I'm attempting to amass a collection of packages that span a variety of
while minimizing the costs of sharing the code across a projects. Stay tuned for languages while minimizing the costs of sharing the code. This also includes
more updates as my definition of the mono-repo becomes more clear, my opinions configuration for things like emacs, tmux, ssh, and other tools.
evolve, and my preferences change.
My configuration also lives inside of my mono-repo. Things like Emacs, Tmux, # Installation (Deprecated)
SSH, and other tools are configured herein.
# Installation The installation instructions here are deprecated. I'd like to manage packaging
and installing with Nix, but that is only partially supported at the
moment.
## wpgtk and gvcci ## wpgtk and gvcci

View file

@ -1,7 +1,7 @@
{ {
nixpkgs ? import <nixpkgs> {}, nixpkgs ? import <nixpkgs> {},
depot ? import <depot> {}, depot ? import <depot> {},
universe ? import <universe> {}, briefcase ? import <briefcase> {},
... ...
}: }:
@ -16,7 +16,7 @@ let
''; '';
in depot.nix.buildLisp.program { in depot.nix.buildLisp.program {
name = "server"; name = "server";
deps = with depot.third_party.lisp; with universe.third_party.lisp; [ deps = with depot.third_party.lisp; with briefcase.third_party.lisp; [
hunchentoot hunchentoot
cl-arrows cl-arrows
]; ];

View file

@ -1,8 +1,8 @@
{ universe ? import <universe> {}, ... }: { briefcase ? import <briefcase> {}, ... }:
universe.nix.buildClojure.program { briefcase.nix.buildClojure.program {
name = "test"; name = "test";
deps = with universe.third_party.clojure; [ deps = with briefcase.third_party.clojure; [
]; ];
srcs = [ srcs = [

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
configs="$DOTFILES/configs" configs="$BRIEFCASE/configs"
case $(hostname) in case $(hostname) in
$DESKTOP) $DESKTOP)

View file

@ -286,7 +286,7 @@ abbr --add ef e ~/functions.zsh
abbr --add el e ~/variables.zsh abbr --add el e ~/variables.zsh
abbr --add ex e ~/.Xresources abbr --add ex e ~/.Xresources
abbr --add em e ~/.tmux.conf abbr --add em e ~/.tmux.conf
abbr --add er e ~/Dropbox/dotfiles/README.md abbr --add er e $BRIEFCASE/README.md
# Couple the s* aliases to the <leader>s* kbds in vim. # Couple the s* aliases to the <leader>s* kbds in vim.
abbr --add sz source ~/.zshrc abbr --add sz source ~/.zshrc

View file

@ -1,6 +1,6 @@
D:~/Dropbox D:~/Dropbox
G:/usr/local/google/home/wpcarro/Downloads G:/usr/local/google/home/wpcarro/Downloads
M:/usr/local/google/home/wpcarro/Downloads M:/usr/local/google/home/wpcarro/Downloads
c:~/dotfiles/configs c:~/briefcase/configs
d:~/dotfiles d:~/briefcase
s:~/Pictures/screenshots s:~/Pictures/screenshots

View file

@ -52,7 +52,7 @@ LOCALE_ARCHIVE=$(readlink ~/.nix-profile/lib/locale)/locale-archive
export LOCALE_ARCHIVE export LOCALE_ARCHIVE
# Set environment variables for Nix. Don't run this for systems running NixOS. # Set environment variables for Nix. Don't run this for systems running NixOS.
# TODO: Learn why I can't use the variables from ~/dotfiles/.envrc. # TODO: Learn why I can't use the variables from ~/briefcase/.envrc.
case $(hostname) in case $(hostname) in
zeno.lon.corp.google.com) . ~/.nix-profile/etc/profile.d/nix.sh;; zeno.lon.corp.google.com) . ~/.nix-profile/etc/profile.d/nix.sh;;
seneca) . ~/.nix-profile/etc/profile.d/nix.sh;; seneca) . ~/.nix-profile/etc/profile.d/nix.sh;;

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
configs="$DOTFILES/configs" configs="$BRIEFCASE/configs"
case $(hostname) in case $(hostname) in
$DESKTOP) $DESKTOP)

View file

@ -62,11 +62,8 @@ Otherwise, open with `counsel-find-file'."
(make-bookmark :label "org" (make-bookmark :label "org"
:path "~/Dropbox/org" :path "~/Dropbox/org"
:kbd "o") :kbd "o")
(make-bookmark :label "universe" (make-bookmark :label "briefcase"
:path "~/universe" :path (getenv "BRIEFCASE")
:kbd "m")
(make-bookmark :label "dotfiles"
:path "~/dotfiles"
:kbd "d") :kbd "d")
(make-bookmark :label "current project" (make-bookmark :label "current project"
:path constants/current-project :path constants/current-project
@ -81,7 +78,7 @@ Otherwise, open with `counsel-find-file'."
(defun bookmark/magit-status () (defun bookmark/magit-status ()
"Use ivy to select a bookmark and jump to its `magit-status' buffer." "Use ivy to select a bookmark and jump to its `magit-status' buffer."
(interactive) (interactive)
(let ((labels (set/new "dotfiles" "universe" "depot")) (let ((labels (set/new "briefcase" "depot"))
(all-labels (->> bookmark/whitelist (all-labels (->> bookmark/whitelist
(list/map (>> bookmark-label)) (list/map (>> bookmark-label))
set/from-list))) set/from-list)))

View file

@ -21,7 +21,7 @@
;; current consumers of these constants, and I'm unsure if the indirection that ;; current consumers of these constants, and I'm unsure if the indirection that
;; globally defined constants introduces is worth it. ;; globally defined constants introduces is worth it.
(defconst constants/current-project "~/universe" (defconst constants/current-project "~/briefcase/blog"
"Variable holding the directory for my currently active project.") "Variable holding the directory for my currently active project.")
(prelude/assert (f-directory? constants/current-project)) (prelude/assert (f-directory? constants/current-project))

View file

@ -20,9 +20,12 @@
(defconst dotfiles/install-kbds? t (defconst dotfiles/install-kbds? t
"When t, install the keybindings.") "When t, install the keybindings.")
(defconst dotfiles/directory (getenv "BRIEFCASE")
"The root directory of my configuration files.")
(defconst dotfiles/whitelist (defconst dotfiles/whitelist
'(("compton" . "~/.config/compton.conf") `(("compton" . "~/.config/compton.conf")
("dotfiles" . "~/dotfiles/") ("dotfiles" . ,dotfiles/directory)
("functions" . "~/functions.zsh") ("functions" . "~/functions.zsh")
("aliases" . "~/aliases.zsh") ("aliases" . "~/aliases.zsh")
("variables" . "~/variables.zsh") ("variables" . "~/variables.zsh")
@ -47,7 +50,7 @@
(defun dotfiles/find-emacs-file (name) (defun dotfiles/find-emacs-file (name)
"Call `find-file' on NAME located in dotfiles's emacs.d directory." "Call `find-file' on NAME located in dotfiles's emacs.d directory."
(find-file (find-file
(f-join "~/dotfiles/configs/shared/.emacs.d" name))) (f-join dotfiles/directory "emacs/.emacs.d" name)))
(provide 'dotfiles) (provide 'dotfiles)
;;; dotfiles.el ends here ;;; dotfiles.el ends here

View file

@ -78,7 +78,7 @@
:index 1 :index 1
:kbd "p") :kbd "p")
(make-exwm/named-workspace (make-exwm/named-workspace
:label "Dotfiles" :label "Briefcase"
:index 2 :index 2
:kbd "d") :kbd "d")
(make-exwm/named-workspace (make-exwm/named-workspace
@ -611,10 +611,8 @@ Currently using super- as the prefix for switching workspaces."
;; Dotfiles ;; Dotfiles
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(progn (progn
(exwm/switch "Dotfiles") (exwm/switch "Briefcase")
(dotfiles/find-emacs-file "init.el") (dotfiles/find-emacs-file "init.el"))
(wpc/evil-window-vsplit-right)
(dotfiles/find-emacs-file "wpc/window-manager.el"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Chatter ;; Chatter
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -641,7 +639,7 @@ Currently using super- as the prefix for switching workspaces."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Reset to default ;; Reset to default
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(exwm/switch "Dotfiles")))) (exwm/switch "Briefcase"))))
(provide 'window-manager) (provide 'window-manager)
;;; window-manager.el ends here ;;; window-manager.el ends here

View file

@ -8,8 +8,10 @@
;; Dependencies ;; Dependencies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(prelude/assert (f-exists? "~/universe")) ;; TODO: These may fail at startup. How can I make sure that the .envrc is
(prelude/assert (f-exists? "~/depot")) ;; consulted when Emacs starts?
(prelude/assert (f-exists? (getenv "BRIEFCASE")))
(prelude/assert (f-exists? (getenv "DEPOT")))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Library ;; Library
@ -19,7 +21,7 @@
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'") :mode "\\.nix\\'")
(defun nix/sly-from-universe (attribute) (defun nix/sly-from-briefcase (attribute)
"Start a Sly REPL configured with a Lisp matching a derivation "Start a Sly REPL configured with a Lisp matching a derivation
from my monorepo. from my monorepo.
@ -29,12 +31,12 @@ This function was taken from @tazjin's depot and adapted for my monorepo.
asynchronously. The build output is included in the error asynchronously. The build output is included in the error
thrown on build failures." thrown on build failures."
(interactive "sAttribute: ") (interactive "sAttribute: ")
(lexical-let* ((outbuf (get-buffer-create (format "*universe-out/%s*" attribute))) (lexical-let* ((outbuf (get-buffer-create (format "*briefcase-out/%s*" attribute)))
(errbuf (get-buffer-create (format "*universe-errors/%s*" attribute))) (errbuf (get-buffer-create (format "*briefcase-errors/%s*" attribute)))
(expression (format "let depot = import <depot> {}; universe = import <universe> {}; in depot.nix.buildLisp.sbclWith [ universe.%s ]" attribute)) (expression (format "let depot = import <depot> {}; briefcase = import <briefcase> {}; in depot.nix.buildLisp.sbclWith [ briefcase.%s ]" attribute))
(command (list "nix-build" "-E" expression))) (command (list "nix-build" "-E" expression)))
(message "Acquiring Lisp for <depot>.%s" attribute) (message "Acquiring Lisp for <briefcase>.%s" attribute)
(make-process :name (format "depot-nix-build/%s" attribute) (make-process :name (format "nix-build/%s" attribute)
:buffer outbuf :buffer outbuf
:stderr errbuf :stderr errbuf
:command command :command command
@ -45,7 +47,7 @@ This function was taken from @tazjin's depot and adapted for my monorepo.
("finished\n" ("finished\n"
(let* ((outpath (s-trim (with-current-buffer outbuf (buffer-string)))) (let* ((outpath (s-trim (with-current-buffer outbuf (buffer-string))))
(lisp-path (s-concat outpath "/bin/sbcl"))) (lisp-path (s-concat outpath "/bin/sbcl")))
(message "Acquired Lisp for <depot>.%s at %s" attribute lisp-path) (message "Acquired Lisp for <briefcase>.%s at %s" attribute lisp-path)
(sly lisp-path))) (sly lisp-path)))
(_ (with-current-buffer errbuf (_ (with-current-buffer errbuf
(error "Failed to build '%s':\n%s" attribute (buffer-string))))) (error "Failed to build '%s':\n%s" attribute (buffer-string)))))

View file

@ -292,7 +292,7 @@ abbr --add ef e ~/functions.zsh
abbr --add el e ~/variables.zsh abbr --add el e ~/variables.zsh
abbr --add ex e ~/.Xresources abbr --add ex e ~/.Xresources
abbr --add em e ~/.tmux.conf abbr --add em e ~/.tmux.conf
abbr --add er e ~/Dropbox/dotfiles/README.md abbr --add er e $BRIEFCASE/README.md
# TODO: consider DRYing this up with `e`. Unfortunately, `sudo` won't support # TODO: consider DRYing this up with `e`. Unfortunately, `sudo` won't support
# aliases. # aliases.
abbr --add en sudo ALTERNATE_EDITOR=nvim emacsclient --no-wait --create-frame /etc/nixos/configuration.nix abbr --add en sudo ALTERNATE_EDITOR=nvim emacsclient --no-wait --create-frame /etc/nixos/configuration.nix

View file

@ -1,12 +1,12 @@
{ {
depot ? import <depot> {}, depot ? import <depot> {},
universe ? import <universe> {}, briefcase ? import <briefcase> {},
... ...
}: }:
depot.nix.buildLisp.library { depot.nix.buildLisp.library {
name = "f"; name = "f";
deps = with universe.lisp; [ deps = with briefcase.lisp; [
prelude prelude
]; ];
srcs = [ srcs = [

View file

@ -1,6 +1,6 @@
{ {
depot ? import <depot> {}, depot ? import <depot> {},
universe ? import <universe> {}, briefcase ? import <briefcase> {},
... ...
}: }:
@ -13,7 +13,7 @@ in depot.nix.buildLisp.library {
name = "cl-colors"; name = "cl-colors";
deps = [ deps = [
depot.third_party.lisp.alexandria depot.third_party.lisp.alexandria
universe.third_party.lisp.let-plus briefcase.third_party.lisp.let-plus
]; ];
srcs = [ srcs = [
"${src}/package.lisp" "${src}/package.lisp"

View file

@ -1,6 +1,6 @@
{ {
depot ? import <depot> {}, depot ? import <depot> {},
universe ? import <universe> {}, briefcase ? import <briefcase> {},
... ...
}: }:
@ -13,7 +13,7 @@ in depot.nix.buildLisp.library {
name = "let-plus"; name = "let-plus";
deps = [ deps = [
depot.third_party.lisp.alexandria depot.third_party.lisp.alexandria
universe.third_party.lisp.anaphora briefcase.third_party.lisp.anaphora
]; ];
srcs = [ srcs = [
"${src}/package.lisp" "${src}/package.lisp"

View file

@ -1,6 +1,6 @@
{ {
depot ? import <depot> {}, depot ? import <depot> {},
universe? import <universe> {}, briefcase ? import <briefcase> {},
... ...
}: }:
@ -16,7 +16,7 @@ in depot.nix.buildLisp.library {
depot.third_party.lisp.cl-ansi-text depot.third_party.lisp.cl-ansi-text
depot.third_party.lisp.alexandria depot.third_party.lisp.alexandria
depot.third_party.lisp.uiop depot.third_party.lisp.uiop
universe.third_party.lisp.cl-colors briefcase.third_party.lisp.cl-colors
]; ];
srcs = [ srcs = [
"${src}/src/asdf.lisp" "${src}/src/asdf.lisp"