diff --git a/home/apps/vscodium.nix b/home/apps/vscodium.nix
index 571e4b6..e464f51 100644
--- a/home/apps/vscodium.nix
+++ b/home/apps/vscodium.nix
@@ -43,7 +43,8 @@
               tamasfe.even-better-toml
             ]
             ++ lib.optional config.modules.terminal.gitIdentity.enable jjk.jjk
-            ++ lib.optional config.modules.terminal.cargo.enable rust-lang.rust-analyzer;
+            ++ lib.optional config.modules.dev.cargo.enable rust-lang.rust-analyzer
+            ++ lib.optional config.modules.dev.uv.enable meta.pyrefly;
 
           userSettings = {
             accessibility.verbosity.walkthrough = false;
diff --git a/home/console/git-identity.nix b/home/console/git-identity.nix
index a5486ad..56dce64 100644
--- a/home/console/git-identity.nix
+++ b/home/console/git-identity.nix
@@ -171,28 +171,7 @@ in {
             remoteHosts);
       };
     };
-    programs.nushell.extraConfig = lib.mkIf config.modules.terminal.flakeManagement.enable ''
-      # Format the repo, commit changes via jujutsu, move the master bookmark forward,
-      # and optionally push it to the remote. A signoff trailer is added automatically.
-      def jjc [
-        --push (-p)        # also push the bookmark to remote after committing
-        message?: string   # commit message; opens an interactive message if omitted
-      ] {
-        nixfm
-
-        if ($message == null) {
-          jj commit
-        } else {
-          jj commit -m $message
-        }
-
-        jj bookmark move master -t @-
-
-        if $push {
-          jj git push
-        }
-      }
-    '';
+
     # ═══════════════════════════════════════════════════════════
     # SOPS — deploys private+public halves for every remote key
     # plus the dedicated commit-signing key
diff --git a/home/dev/cargo.nix b/home/dev/cargo.nix
index e484213..a88e963 100644
--- a/home/dev/cargo.nix
+++ b/home/dev/cargo.nix
@@ -5,7 +5,7 @@
   inputs,
   ...
 }: {
-  options.modules.terminal.cargo = {
+  options.modules.dev.cargo = {
     enable = lib.mkOption {
       default = config.modules.dev.enable;
       description = "Rust toolchain (cargo, rustc) and cargo configuration";
diff --git a/home/dev/nix-flake.nix b/home/dev/nix-flake.nix
index 965d7e5..f3c4bb9 100644
--- a/home/dev/nix-flake.nix
+++ b/home/dev/nix-flake.nix
@@ -54,6 +54,27 @@
         # Update the flake's inputs, then rebuild.
         def upflake []  { flake-banner; flake-runner --pull --update --format --rebuild ${runnerArgs} }
 
+        # Format the repo, commit changes via jujutsu, move the master bookmark forward,
+        # and optionally push it to the remote. A signoff trailer is added automatically.
+        def jjc [
+          --push (-p)        # also push the bookmark to remote after committing
+          message?: string   # commit message; opens an interactive message if omitted
+        ] {
+          nixfm
+
+          if ($message == null) {
+            jj commit
+          } else {
+            jj commit -m $message
+          }
+
+          jj bookmark move master -t @-
+
+          if $push {
+            jj git push
+          }
+        }
+
         # Pull a live NetworkManager connection profile out of
         # /etc/NetworkManager/system-connections, sops-encrypt it as a
         # binary secret, and drop it into secrets/connections/ so
diff --git a/home/dev/uv.nix b/home/dev/uv.nix
index 98aa831..1cce1d5 100644
--- a/home/dev/uv.nix
+++ b/home/dev/uv.nix
@@ -1,10 +1,9 @@
-# home/development/uv.nix
 {
   config,
   lib,
   ...
 }: {
-  options.modules.terminal.uv = {
+  options.modules.dev.uv = {
     enable = lib.mkOption {
       default = config.modules.dev.enable;
       description = "uv, the Python package and project manager";
@@ -22,14 +21,14 @@
     };
   };
 
-  config = lib.mkIf config.modules.terminal.uv.enable {
+  config = lib.mkIf config.modules.dev.uv.enable {
     programs.uv = {
       enable = true;
 
       python = {
-        default = config.modules.terminal.uv.pythonVersion;
+        default = config.modules.dev.uv.pythonVersion;
         prune = true;
-        versions = [config.modules.terminal.uv.pythonVersion];
+        versions = [config.modules.dev.uv.pythonVersion];
       };
 
       settings = {
@@ -38,7 +37,7 @@
       };
 
       tool = {
-        packages = config.modules.terminal.uv.tools;
+        packages = config.modules.dev.uv.tools;
         prune = true;
       };
     };