diff --git a/.envrc b/.envrc index 0a0185c19..f097cc4eb 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,2 @@ export DOTFILES=~/dotfiles -NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs:depot=$HOME/depot:universe=$HOME/mono +NIX_PATH=nixpkgs=$HOME/.nix-defexpr/nixpkgs:depot=$HOME/depot:universe=$HOME/universe diff --git a/configs/shared/.emacs.d/wpc/bookmark.el b/configs/shared/.emacs.d/wpc/bookmark.el index 851f9be09..734ddaa13 100644 --- a/configs/shared/.emacs.d/wpc/bookmark.el +++ b/configs/shared/.emacs.d/wpc/bookmark.el @@ -12,6 +12,10 @@ ;;; Code: +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Dependencies +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (require 'f) (require 'buffer) (require 'list) @@ -58,8 +62,8 @@ Otherwise, open with `counsel-find-file'." (make-bookmark :label "org" :path "~/Dropbox/org" :kbd "o") - (make-bookmark :label "mono" - :path "~/mono" + (make-bookmark :label "universe" + :path "~/universe" :kbd "m") (make-bookmark :label "dotfiles" :path "~/dotfiles" @@ -77,7 +81,7 @@ Otherwise, open with `counsel-find-file'." (defun bookmark/magit-status () "Use ivy to select a bookmark and jump to its `magit-status' buffer." (interactive) - (let ((labels (set/new "dotfiles" "mono" "depot")) + (let ((labels (set/new "dotfiles" "universe" "depot")) (all-labels (->> bookmark/whitelist (list/map (>> bookmark-label)) set/from-list))) diff --git a/configs/shared/.emacs.d/wpc/constants.el b/configs/shared/.emacs.d/wpc/constants.el index bca2ad45e..b4a57f49c 100644 --- a/configs/shared/.emacs.d/wpc/constants.el +++ b/configs/shared/.emacs.d/wpc/constants.el @@ -10,9 +10,11 @@ ;; current consumers of these constants, and I'm unsure if the indirection that ;; globally defined constants introduces is worth it. -(defconst constants/current-project "~/mono" +(defconst constants/current-project "~/universe" "Variable holding the directory for my currently active project.") +(prelude/assert (f-directory? constants/current-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] diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-nix.el b/configs/shared/.emacs.d/wpc/packages/wpc-nix.el index e2e098308..68d542e01 100644 --- a/configs/shared/.emacs.d/wpc/packages/wpc-nix.el +++ b/configs/shared/.emacs.d/wpc/packages/wpc-nix.el @@ -8,7 +8,7 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(prelude/assert (f-exists? "~/mono")) +(prelude/assert (f-exists? "~/universe")) (prelude/assert (f-exists? "~/depot")) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;