diff --git a/flake.lock b/flake.lock
index 0ef4b27..f91daea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703415240,
-        "narHash": "sha256-SgsAYwDo2wWHUdZeNKKRRT402sRzQ/rLmzxH/wqMUPw=",
+        "lastModified": 1703990467,
+        "narHash": "sha256-LItEeQVwDfLnavNskwdfRnonbEdq8DYiJlWRtF+bwng=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f454cff5fe84adca9e8aa8d546d2c9879b789950",
+        "rev": "1a41453cba42a3a1af2fff003be455ddbd75386c",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1703527373,
-        "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=",
+        "lastModified": 1704100519,
+        "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "80679ea5074ab7190c4cce478c600057cfb5edae",
+        "rev": "6e91c5df192395753d8e6d55a0352109cb559790",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1703547671,
-        "narHash": "sha256-SAIM3L14osK6+o+6JN9IOgSrVnccVb16SDrsv42PA4I=",
+        "lastModified": 1704154437,
+        "narHash": "sha256-h6k9zJBrZgttWzbF6ppFL8ad1gka62MU5BRjTKihKRI=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "b070519b8a647cc56b0366bca5b9312b6250114e",
+        "rev": "71121116defe7fc74389f85729b56ac5d2ed344c",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
     "homebrew-cask-fonts": {
       "flake": false,
       "locked": {
-        "lastModified": 1703448672,
-        "narHash": "sha256-jn8QI4KYRKUzC58I3bqcSvFa3VZykcRx2mc7cstcRbA=",
+        "lastModified": 1704003358,
+        "narHash": "sha256-gu7uOQQf3ISHB1RmaRu9i9ob05TYWss3h+7mPUuqCu8=",
         "owner": "homebrew",
         "repo": "homebrew-cask-fonts",
-        "rev": "cc54a5c9f085c402d479431a26f86eb3f09c1e64",
+        "rev": "8524380dd27bf99f1ae85b079043ec33227cc93d",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1703547454,
-        "narHash": "sha256-RK8KVUpDjimoEwrwvUGnvQwd8bmE4R3Ep712yV7EmKQ=",
+        "lastModified": 1704152394,
+        "narHash": "sha256-fMEWOMNPaViZlA3rE52qfDR1+t4cWAgL7QPlIg8eAFE=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "d34d759d15682a975300ba8197823a6586aa10a6",
+        "rev": "042c7524bda45cb7363c816286928ab030b85df3",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703255338,
-        "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
+        "lastModified": 1703637592,
+        "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
+        "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
         "type": "github"
       },
       "original": {
@@ -240,11 +240,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1703255338,
-        "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
+        "lastModified": 1703961334,
+        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
+        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
         "type": "github"
       },
       "original": {
diff --git a/shared/config/starship-tokyo-night.toml b/shared/config/starship-tokyo-night.toml
new file mode 100644
index 0000000..4972a7b
--- /dev/null
+++ b/shared/config/starship-tokyo-night.toml
@@ -0,0 +1,64 @@
+format = """
+[░▒▓](#a3aed2)\
+[  ](bg:#a3aed2 fg:#090c0c)\
+[](bg:#769ff0 fg:#a3aed2)\
+$directory\
+[](fg:#769ff0 bg:#394260)\
+$git_branch\
+$git_status\
+[](fg:#394260 bg:#212736)\
+$nodejs\
+$rust\
+$golang\
+$php\
+[](fg:#212736 bg:#1d2230)\
+$time\
+[ ](fg:#1d2230)\
+\n$character"""
+
+[directory]
+style = "fg:#e3e5e5 bg:#769ff0"
+format = "[ $path ]($style)"
+truncation_length = 3
+truncation_symbol = "…/"
+
+[directory.substitutions]
+"Documents" = "󰈙 "
+"Downloads" = " "
+"Music" = " "
+"Pictures" = " "
+
+[git_branch]
+symbol = ""
+style = "bg:#394260"
+format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'
+
+[git_status]
+style = "bg:#394260"
+format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'
+
+[nodejs]
+symbol = ""
+style = "bg:#212736"
+format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+
+[rust]
+symbol = ""
+style = "bg:#212736"
+format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+
+[golang]
+symbol = ""
+style = "bg:#212736"
+format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+
+[php]
+symbol = ""
+style = "bg:#212736"
+format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+
+[time]
+disabled = false
+time_format = "%R" # Hour:Minute Format
+style = "bg:#1d2230"
+format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'
diff --git a/shared/home-manager.nix b/shared/home-manager.nix
index 2ca7290..21e75bc 100644
--- a/shared/home-manager.nix
+++ b/shared/home-manager.nix
@@ -69,7 +69,7 @@ in
   kitty = {
     enable = true;
     font = {
-      name = "JetBrains Mono";
+      name = "JetBrainsMono Nerd Font";
       size = 14;
     };
     settings = {
@@ -172,6 +172,31 @@ in
   starship = {
     enable = true;
     enableNushellIntegration = true;
+    settings = (with builtins; fromTOML (readFile ./config/starship-tokyo-night.toml)) // {
+      # Overrides
+    };
+  };
+
+  topgrade = {
+    enable = true;
+    settings = {
+      misc.disable = [
+        "brew_cask"
+        "brew_formula"
+        "containers"
+        "gem"
+        "node"
+        "ruby_gems"
+        "tlmgr"
+        "vim"
+      ];
+      misc.assume_yes = true;
+      misc.cleanup = true;
+      misc.no_retry = true;
+      pre_commands = {
+        "Home Manager" = "nix flake update ~/nix-config/ && ~/nix-config/bin/build";
+      };
+    };
   };
 
   zoxide = {
diff --git a/shared/packages.nix b/shared/packages.nix
index ac92a11..fc40b91 100644
--- a/shared/packages.nix
+++ b/shared/packages.nix
@@ -9,7 +9,6 @@ with pkgs; [
   pandoc
   tectonic
   texlab
-  topgrade
   typst
 
   # Encryption and security tools
@@ -24,6 +23,7 @@ with pkgs; [
   iosevka
   ibm-plex
   atkinson-hyperlegible
+  (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
 
   # C(++) development tools
   ccache