diff --git a/flake.nix b/flake.nix
index 40e2cb7..d9224c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,10 +95,7 @@
       ];
 
       defaultAttrs = {
-        user = {
-          name = common.username;
-          password = "temp"; # TODO
-        };
+        username = common.username;
         version = common.system.version;
         wayland.enable = true;
         nvidia.enable = false;
@@ -120,7 +117,7 @@
           {
             hostName,
             system,
-            user,
+            username,
             ...
           }@systemConfig:
 
@@ -157,7 +154,7 @@
                         systemConfig
                         ;
                     };
-                    users.${user.name} = import ./hosts/${hostName}/home-manager;
+                    users.${username} = import ./hosts/${hostName}/home-manager;
                   };
                 }
                 {
diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix
index 16d3a71..1e749ee 100644
--- a/hosts/pi4/default.nix
+++ b/hosts/pi4/default.nix
@@ -22,7 +22,7 @@
 
   users = {
     mutableUsers = false;
-    users.${systemConfig.user.name} = {
+    users.${systemConfig.username} = {
       isNormalUser = true;
       hashedPasswordFile = config.sops.secrets.password.path;
       extraGroups = [ "wheel" ];
diff --git a/shared/home-manager/default.nix b/shared/home-manager/default.nix
index 6412cea..721ab94 100644
--- a/shared/home-manager/default.nix
+++ b/shared/home-manager/default.nix
@@ -28,7 +28,7 @@ in
   ];
 
   home = {
-    username = systemConfig.user.name;
+    username = systemConfig.username;
     homeDirectory = dir.home;
 
     sessionVariables = {
diff --git a/shared/home-manager/development/zed.nix b/shared/home-manager/development/zed.nix
index 44255cd..ef55846 100644
--- a/shared/home-manager/development/zed.nix
+++ b/shared/home-manager/development/zed.nix
@@ -27,17 +27,17 @@
           version = "2";
         };
         autosave = "on_focus_change";
+        auto_update = false;
         base_keymap = "JetBrains";
         buffer_font_family = font;
         features = {
           edit_completion_provider = "zed";
         };
-        icon_theme = "Catppuccin Mocha";
-        # icon_theme = { TODO replace icon theme above with below
-        #   mode = theme.mode;
-        #   light = "Catppuccin Mocha";
-        #   dark = "Catppuccin Mocha";
-        # };
+        icon_theme = {
+          mode = theme.mode;
+          light = "Catppuccin Latte";
+          dark = "Catppuccin Mocha";
+        };
         ui_font_family = font;
         ui_font_size = fontSize;
         buffer_font_size = fontSize;
diff --git a/shared/modules/security/sops.nix b/shared/modules/security/sops.nix
index 7e9a4ba..6d49091 100644
--- a/shared/modules/security/sops.nix
+++ b/shared/modules/security/sops.nix
@@ -14,7 +14,7 @@
     defaultSopsFile = lib.custom.relativeToRoot "shared/secrets/secrets.yaml";
     defaultSopsFormat = "yaml";
 
-    age.keyFile = "/home/${systemConfig.user.name}/.config/sops/age/keys.txt";
+    age.keyFile = "/home/${systemConfig.username}/.config/sops/age/keys.txt";
     secrets.password.neededForUsers = true;
   };
 }
diff --git a/shared/modules/users.nix b/shared/modules/users.nix
index 62a29e9..a7991e5 100644
--- a/shared/modules/users.nix
+++ b/shared/modules/users.nix
@@ -1,6 +1,6 @@
 { config, systemConfig, ... }:
 let
-  username = systemConfig.user.name;
+  username = systemConfig.username;
 in
 {
   users.users.${username} = {