diff --git a/.justfile b/.justfile
new file mode 100644
index 0000000..e72d1e0
--- /dev/null
+++ b/.justfile
@@ -0,0 +1,4 @@
+
+# Run home-manager switch to update Nix environment
+nixup:
+    cd "{{justfile_directory()}}`/nix" && home-manager switch --flake ".#std"
diff --git a/emacs/init.el b/emacs/init.el
index df04ff5..e10e3c8 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -669,6 +669,16 @@
 
 ;;;; Emacs Server
 (server-start)
+;;;; Just
+
+(use-package just-mode
+  :ensure t)
+
+(use-package justl
+  :ensure t
+  :bind (("C-c j" . justl-exec-default-recipe)
+         ("C-c J" . justl)))
+
 ;;; Org-mode
 (use-package org
   :bind (("C-c o ," . my/org-clear-all)
diff --git a/nix/home.nix b/nix/home.nix
index 85704e8..c9dc4fe 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -27,6 +27,7 @@
     roboto-mono
     aider-chat
     sops
+    just
   ];
 
   imports = [