diff --git a/flake.lock b/flake.lock
index 6cf149f..e055ffc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736916166,
-        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
+        "lastModified": 1736867362,
+        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
+        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737143193,
-        "narHash": "sha256-+/BdPFrdJpgmzrMEUZMxsLeND8IvFtjyZbxHX2XrNv4=",
+        "lastModified": 1736964246,
+        "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "aa839cf994f6b9a6b38e755597452087beac0567",
+        "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d",
         "type": "github"
       },
       "original": {
@@ -456,11 +456,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737103437,
-        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
+        "lastModified": 1736154270,
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1737062831,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "lastModified": 1736883708,
+        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
         "type": "github"
       },
       "original": {
diff --git a/system/default.nix b/system/default.nix
index 3fdd0cf..f4197e2 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -54,25 +54,22 @@ in
           # Shell prompt
           starship = {
             enable = true;
-            settings = lib.mkMerge [
-              {
-                format = "$time$all";
-                add_newline = false;
-                cmd_duration.min_time = 500;
-                cmd_duration.show_milliseconds = true;
-                time.disabled = false;
-                status = {
-                  format = "[$signal_name$common_meaning$maybe_int](red)";
-                  symbol = "[✗](bold red)";
-                  disabled = false;
-                };
-                sudo.disabled = false;
-              }
-              # Add nerdfont symbols
-              (lib.mkIf cfg.styling.enable (import ./starship-nerdfont-symbols.nix))
-              # Remove the `in`s and `on`s from the prompt
-              (lib.mkIf cfg.styling.enable (import ./starship-shorter-text.nix))
-            ];
+            settings = {
+              format = "$time$all";
+              add_newline = false;
+              cmd_duration.min_time = 500;
+              cmd_duration.show_milliseconds = true;
+              time = {
+                format = "[$time](bold yellow) ";
+                disabled = false;
+              };
+              status = {
+                format = "[$signal_name$common_meaning$maybe_int](red)";
+                symbol = "[✗](bold red)";
+                disabled = false;
+              };
+              sudo.disabled = false;
+            };
           };
           # Default shell
           zsh.enable = true;
diff --git a/system/starship-nerdfont-symbols.nix b/system/starship-nerdfont-symbols.nix
deleted file mode 100644
index 2032150..0000000
--- a/system/starship-nerdfont-symbols.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  aws.symbol = "  ";
-  buf.symbol = " ";
-  c.symbol = " ";
-  conda.symbol = " ";
-  crystal.symbol = " ";
-  dart.symbol = " ";
-  directory.read_only = " 󰌾";
-  docker_context.symbol = " ";
-  elixir.symbol = " ";
-  elm.symbol = " ";
-  fennel.symbol = " ";
-  fossil_branch.symbol = " ";
-  git_branch.symbol = " ";
-  git_commit.tag_symbol = "  ";
-  golang.symbol = " ";
-  gradle.symbol = " ";
-  guix_shell.symbol = " ";
-  haskell.symbol = " ";
-  haxe.symbol = " ";
-  hg_branch.symbol = " ";
-  hostname.ssh_symbol = " ";
-  java.symbol = " ";
-  julia.symbol = " ";
-  kotlin.symbol = " ";
-  lua.symbol = " ";
-  memory_usage.symbol = "󰍛 ";
-  meson.symbol = "󰔷 ";
-  nim.symbol = "󰆥 ";
-  nix_shell.symbol = " ";
-  nodejs.symbol = " ";
-  ocaml.symbol = " ";
-  package.symbol = "󰏗 ";
-  perl.symbol = " ";
-  php.symbol = " ";
-  pijul_channel.symbol = " ";
-  python.symbol = " ";
-  rlang.symbol = "󰟔 ";
-  ruby.symbol = " ";
-  rust.symbol = "󱘗 ";
-  scala.symbol = " ";
-  swift.symbol = " ";
-  zig.symbol = " ";
-  os.symbols = {
-    Alpaquita = " ";
-    Alpine = " ";
-    AlmaLinux = " ";
-    Amazon = " ";
-    Android = " ";
-    Arch = " ";
-    Artix = " ";
-    CentOS = " ";
-    Debian = " ";
-    DragonFly = " ";
-    Emscripten = " ";
-    EndeavourOS = " ";
-    Fedora = " ";
-    FreeBSD = " ";
-    Garuda = "󰛓 ";
-    Gentoo = " ";
-    HardenedBSD = "󰞌 ";
-    Illumos = "󰈸 ";
-    Kali = " ";
-    Linux = " ";
-    Mabox = " ";
-    Macos = " ";
-    Manjaro = " ";
-    Mariner = " ";
-    MidnightBSD = " ";
-    Mint = " ";
-    NetBSD = " ";
-    NixOS = " ";
-    OpenBSD = "󰈺 ";
-    openSUSE = " ";
-    OracleLinux = "󰌷 ";
-    Pop = " ";
-    Raspbian = " ";
-    Redhat = " ";
-    RedHatEnterprise = " ";
-    RockyLinux = " ";
-    Redox = "󰀘 ";
-    Solus = "󰠳 ";
-    SUSE = " ";
-    Ubuntu = " ";
-    Unknown = " ";
-    Void = " ";
-    Windows = "󰍲 ";
-  };
-}
diff --git a/system/starship-shorter-text.nix b/system/starship-shorter-text.nix
deleted file mode 100644
index 605a53a..0000000
--- a/system/starship-shorter-text.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  aws.format = "[$symbol($profile)(\\($region\\))(\\[$duration\\])]($style) ";
-  bun.format = "[$symbol($version)]($style) ";
-  c.format = "[$symbol($version(-$name))]($style) ";
-  cmake.format = "[$symbol($version)]($style) ";
-  cmd_duration.format = "[⏱ $duration]($style) ";
-  cobol.format = "[$symbol($version)]($style) ";
-  conda.format = "[$symbol$environment]($style) ";
-  crystal.format = "[$symbol($version)]($style) ";
-  daml.format = "[$symbol($version)]($style) ";
-  dart.format = "[$symbol($version)]($style) ";
-  deno.format = "[$symbol($version)]($style) ";
-  docker_context.format = "[$symbol$context]($style) ";
-  dotnet.format = "[$symbol($version)(🎯 $tfm)]($style) ";
-  elixir.format = "[$symbol($version \\(OTP $otp_version\\))]($style) ";
-  elm.format = "[$symbol($version)]($style) ";
-  erlang.format = "[$symbol($version)]($style) ";
-  fennel.format = "[$symbol($version)]($style) ";
-  fossil_branch.format = "[$symbol$branch]($style) ";
-  gcloud.format = "[$symbol$account(@$domain)(\\($region\\))]($style) ";
-  git_branch.format = "[$symbol$branch]($style) ";
-  git_status.format = "[$all_status$ahead_behind]($style) ";
-  golang.format = "[$symbol($version)]($style) ";
-  gradle.format = "[$symbol($version)]($style) ";
-  guix_shell.format = "[$symbol]($style) ";
-  haskell.format = "[$symbol($version)]($style) ";
-  haxe.format = "[$symbol($version)]($style) ";
-  helm.format = "[$symbol($version)]($style) ";
-  hg_branch.format = "[$symbol$branch]($style) ";
-  java.format = "[$symbol($version)]($style) ";
-  julia.format = "[$symbol($version)]($style) ";
-  kotlin.format = "[$symbol($version)]($style) ";
-  kubernetes.format = "[$symbol$context( \\($namespace\\))]($style) ";
-  lua.format = "[$symbol($version)]($style) ";
-  memory_usage.format = "$symbol[$ram( | $swap)]($style) ";
-  meson.format = "[$symbol$project]($style) ";
-  nim.format = "[$symbol($version)]($style) ";
-  nix_shell.format = "[$symbol$state( \\($name\\))]($style) ";
-  nodejs.format = "[$symbol($version)]($style) ";
-  ocaml.format = "[$symbol($version)(\\($switch_indicator$switch_name\\))]($style) ";
-  opa.format = "[$symbol($version)]($style) ";
-  openstack.format = "[$symbol$cloud(\\($project\\))]($style) ";
-  os.format = "[$symbol]($style) ";
-  package.format = "[$symbol$version]($style) ";
-  perl.format = "[$symbol($version)]($style) ";
-  php.format = "[$symbol($version)]($style) ";
-  pijul_channel.format = "[$symbol$channel]($style) ";
-  pulumi.format = "[$symbol$stack]($style) ";
-  purescript.format = "[$symbol($version)]($style) ";
-  python.format = "[\${symbol}\${pyenv_prefix}(\${version})(\\($virtualenv\\))]($style) ";
-  raku.format = "[$symbol($version-$vm_version)]($style) ";
-  red.format = "[$symbol($version)]($style) ";
-  ruby.format = "[$symbol($version)]($style) ";
-  rust.format = "[$symbol($version)]($style) ";
-  scala.format = "[$symbol($version)]($style) ";
-  spack.format = "[$symbol$environment]($style) ";
-  sudo.format = "[as $symbol]($style) ";
-  swift.format = "[$symbol($version)]($style) ";
-  terraform.format = "[$symbol$workspace]($style) ";
-  time.format = "[$time]($style) ";
-  username.format = "[$user]($style) ";
-  vagrant.format = "[$symbol($version)]($style) ";
-  vlang.format = "[$symbol($version)]($style) ";
-  zig.format = "[$symbol($version)]($style) ";
-  solidity.format = "[$symbol($version)]($style) ";
-}