5 files changed, 13 insertions, 16 deletions
diff --git a/users/grfn/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix
index 504a382c208c..67c3968ae410 100644
--- a/users/grfn/system/home/machines/yeren.nix
+++ b/users/grfn/system/home/machines/yeren.nix
@@ -39,16 +39,7 @@ in
 
     steam
 
-    (awscli2.overridePythonAttrs (oldAttrs: {
-      postPatch = ''
-        substituteInPlace setup.py \
-          --replace 'colorama>=0.2.5,<0.4.4' 'colorama'  \
-          --replace 'wcwidth<0.2.0' 'colorama' \
-          --replace 'cryptography>=2.8.0,<=2.9.0' 'cryptography' \
-          --replace 'docutils>=0.10,<0.16' 'docutils' \
-          --replace 'ruamel.yaml>=0.15.0,<0.16.0' 'ruamel.yaml'
-      '';
-    }))
+    awscli2
   ];
 
   systemd.user.services.laptop-keyboard = {
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 43bb7a79a21d..a79f5b98755f 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -76,7 +76,7 @@ with lib;
 
     nodePackages.prettier
   ] ++ optionals (stdenv.isLinux) [
-    julia
+    julia-stable
     valgrind
   ];
 
diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix
index 77c4dda9a558..f9b6e0a1daba 100644
--- a/users/grfn/system/system/machines/mugwump.nix
+++ b/users/grfn/system/system/machines/mugwump.nix
@@ -274,6 +274,12 @@ with lib;
     };
   }) (range 1 1));
 
-  users.users."buildkite-agent-mugwump-1".extraGroups = [ "docker" ];
-  users.users."buildkite-agent-mugwump-2".extraGroups = [ "docker" ];
+  users.users."buildkite-agent-mugwump-1" = {
+    isSystemUser = true;
+    extraGroups = [ "docker" ];
+  };
+  users.users."buildkite-agent-mugwump-2" = {
+    isSystemUser = true;
+    extraGroups = [ "docker" ];
+  };
 }
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 082346da75b9..12a56f9625d9 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -33,7 +33,7 @@ let
   (with epkgs.melpaPackages; [
     ace-window
     ace-link
-    bazel-mode
+    # bazel-mode TODO(tazjin): where did this go?
     browse-kill-ring
     cargo
     company
@@ -47,7 +47,7 @@ let
     eglot
     elixir-mode
     elm-mode
-    erlang
+    # erlang
     go-mode
     gruber-darker-theme
     haskell-mode
diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix
index ec72377f4a6e..19a42f163c15 100644
--- a/users/tazjin/nixos/camden/default.nix
+++ b/users/tazjin/nixos/camden/default.nix
@@ -155,7 +155,7 @@ in lib.fix(self: {
     groups.git = {};
     users.git = {
       group = "git";
-      isNormalUser = false;
+      isSystemUser = true;
     };
   };