diff --git a/users/nolan/default.nix b/users/nolan/default.nix
index b393374..68943f3 100644
--- a/users/nolan/default.nix
+++ b/users/nolan/default.nix
@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   users.users.nolan = {
     description = "Nolan Darilek";
@@ -11,12 +13,15 @@
       "pipewire"
       "pulse-access"
     ];
+    shell = pkgs.fish;
   };
 
+  programs.fish.enable = true;
+
   home-manager.users.nolan = {
     home.stateVersion = "24.05";
     programs = {
-      bash.enable = true;
+      fish.enable = true;
       direnv = {
         enable = true;
         nix-direnv.enable = true;
diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix
index 1b77693..9af75d2 100644
--- a/users/nolan/desktop.nix
+++ b/users/nolan/desktop.nix
@@ -43,6 +43,15 @@
           credential.helper = "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret";
         };
       };
+      jujutsu = {
+        enable = true;
+        settings = {
+          user = {
+            name = "Nolan Darilek";
+            email = "nolan@thewordnerd.info";
+          };
+        };
+      };
       obs-studio = {
         enable = true;
         plugins = with pkgs.obs-studio-plugins; [