diff --git a/nix-os/shell.nix b/nix-os/shell.nix
index 73476af..891e3b9 100644
--- a/nix-os/shell.nix
+++ b/nix-os/shell.nix
@@ -131,7 +131,20 @@ in
     programs.starship = {
       enable = true;
       settings = {
-        format = "$all$line_break\${custom.ranger}$jobs$battery$time$status$os$container$shell$character";
+        format = lib.concatStrings [
+          "$all"
+          "\${custom.sshAuthSocket}"
+          "$line_break"
+          "\${custom.ranger}"
+          "$jobs"
+          "$battery"
+          "$time"
+          "$status"
+          "$os"
+          "$container"
+          "$shell"
+          "$character"
+        ];
         directory = {
           truncation_length = 5;
           truncation_symbol = "…/";
@@ -148,6 +161,12 @@ in
           command = "echo \"✦\"";
           style = "bold 208";
         };
+        custom.sshAuthSocket = {
+          when = "test -S \"$SSH_AUTH_SOCK\"";
+          command = "echo -e \"SSH Auth Agent\"";
+          style = "124";
+          format = "with [$output]($style) ";
+        };
       };
     };
   };
diff --git a/update-list.nix b/update-list.nix
index dd007cf..ce8c49b 100644
--- a/update-list.nix
+++ b/update-list.nix
@@ -5,13 +5,10 @@ self:
   inputsWithPackages = import self.inputsPath {
     pkgs = self.packagesForSystem builtins.currentSystem;
   };
-in {
-  "inputs/nixpkgs" = inputsWithPackages.nixpkgs;
-  "inputs/nixpkgs-unstable" = inputsWithPackages.nixpkgs-unstable;
-  "inputs/nix-bitcoin" = inputsWithPackages.nix-bitcoin;
-  "inputs/cosmic-modules" = inputsWithPackages.cosmic-modules;
-  "inputs/nixos-vscode-server" = inputsWithPackages.nixos-vscode-server;
-})
+in self.lib.concatMapAttrs (name: value: {
+  "inputs/${name}" = value;
+}) inputsWithPackages
+)
 
 # MARK: NixOS modules
 // ( let