diff --git a/home/home.nix b/home/home.nix
index b18c7c6..1928b8c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -12,7 +12,7 @@
     ./modules/theme.nix
     ./modules/shell.nix
     ./modules/terminal.nix
-    ./modules/git.nix
+    ./modules/vcs.nix
     ./modules/editor.nix
     ./modules/packages.nix
   ]
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 4ee580b..78f58bd 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -112,7 +112,6 @@ in
       typst
       typstyle
       glab
-      jujutsu
     ]
     ++ lib.optionals hostConfig.isLinux [
       bitwarden-desktop
diff --git a/home/modules/git.nix b/home/modules/vcs.nix
similarity index 87%
rename from home/modules/git.nix
rename to home/modules/vcs.nix
index c1ddaf4..ed4dedd 100644
--- a/home/modules/git.nix
+++ b/home/modules/vcs.nix
@@ -6,6 +6,11 @@
   ...
 }:
 
+let
+  name = "Barrett Ruth";
+  email = "br.barrettruth@gmail.com";
+  gpgKey = "A6C96C9349D2FC81";
+in
 {
   programs.git = {
     enable = true;
@@ -45,15 +50,12 @@
     ];
 
     signing = {
-      key = "A6C96C9349D2FC81";
+      key = gpgKey;
       signByDefault = true;
     };
 
     settings = {
-      user = {
-        name = "Barrett Ruth";
-        email = "br.barrettruth@gmail.com";
-      };
+      user = { inherit name email; };
       alias = {
         a = "add";
         b = "branch";
@@ -100,6 +102,26 @@
     };
   };
 
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      user = { inherit name email; };
+      signing = {
+        behavior = "own";
+        backend = "gpg";
+        key = gpgKey;
+      };
+      ui = {
+        editor = "nvim";
+        pager = "less -FRX";
+        diff-editor = ":builtin";
+        merge-editor = "vimdiff";
+      };
+      git.sign-on-push = true;
+      merge-tools.vimdiff.program = "nvim";
+    };
+  };
+
   programs.gh = {
     enable = true;
     settings = {
diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix
index e134d0f..c067c87 100644
--- a/hosts/xps15/configuration.nix
+++ b/hosts/xps15/configuration.nix
@@ -35,6 +35,7 @@ in
     fontSize = 36;
   };
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/efi";
   boot.kernelParams = [
     "loglevel=3"
     "quiet"
diff --git a/hosts/xps15/hardware-configuration.nix b/hosts/xps15/hardware-configuration.nix
index 356ba23..d76ab2a 100644
--- a/hosts/xps15/hardware-configuration.nix
+++ b/hosts/xps15/hardware-configuration.nix
@@ -31,7 +31,7 @@
     fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
+  fileSystems."/efi" = {
     device = "/dev/disk/by-uuid/5646-BF32";
     fsType = "vfat";
     options = [