direnv

4 files changed, 13 insertions, 5 deletions

diff --git a/direnv/.config/direnv/direnvrc b/direnv/.config/direnv/direnvrc
new file mode 100755
index 0000000..0f1f039
--- /dev/null
+++ b/direnv/.config/direnv/direnvrc
@@ -0,0 +1,5 @@
+use_flake() {
+  watch_file flake.nix
+  watch_file flake.lock
+  eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
+}
diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index 65390f7..da165ce 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -29,10 +29,10 @@
        vertico           ; the search engine of the future
 
        :ui
-       deft              ; notational velocity for Emacs
+       ;;deft            ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
-       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        ;;fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
@@ -50,7 +50,7 @@
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        (window-select +numbers) ; visually switch windows
-       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;workspaces        ; tab emulation, persistence & separate workspaces
        zen               ; distraction-free coding or writing
        ;; (emoji +unicode)  ; 😇
 
@@ -89,7 +89,7 @@
        :tools
        ;;ansible
        ;;debugger          ; FIXME stepping through code, to help you add bugs
-       ;;direnv
+       direnv
        ;;docker
        editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
@@ -156,7 +156,7 @@
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
diff --git a/setup.sh b/setup.sh
index 587a64c..61e0689 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,6 +11,7 @@ touch ~/.zshenv.local
 
 $STOW common
 $STOW zsh
+$STOW direnv
 touch $HOME/.zshrc.local
 source $HOME/.zshenv
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 611fd40..9e227da 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -82,5 +82,7 @@ bindkey "^[u" get-parent-dir
 
 source ~/.zshrc.local
 
+(( $+commands[direnv] )) && eval "$(direnv hook zsh)"
+
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.zsh/p10k.zsh ]] || source ~/.zsh/p10k.zsh