diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
index 5b711eb..63daf6b 100644
--- a/home/apps/vscode.nix
+++ b/home/apps/vscode.nix
@@ -87,9 +87,6 @@ in {
     mutableExtensionsDir = true;
 
     userSettings = {
-      "workbench.settings.editor" = "json";
-
-      /* UI */
       "workbench.iconTheme" = "catppuccin-latte";
       "workbench.colorTheme" = "Catppuccin Latte";
       "workbench.preferredDarkColorTheme" = "Catppuccin Frappé";
@@ -103,7 +100,6 @@ in {
       "window.nativeTabs" = true;
       "editor.minimap.enabled" = false;
 
-      /* Editor */
       "editor.fontFamily" = "CommitMono Nerd Font";
       "editor.fontLigatures" = true;
       "editor.fontWeight" = "normal";
@@ -121,7 +117,6 @@ in {
       "terminal.integrated.cursorBlinking" = true;
       "editor.cursorSmoothCaretAnimation" = "off";
 
-      /* Formatting */
       "editor.formatOnSave" = true;
       "editor.defaultFormatter" = "esbenp.prettier-vscode";
       "editor.tabSize" = 4;
@@ -150,17 +145,11 @@ in {
         "editor.formatOnSave" = true;
       };
 
-      /* Git */
       "git.autofetch" = true;
       "git.confirmSync" = false;
       "git.suggestSmartCommit" = false;
       "git.openRepositoryInParentFolders" = "never";
 
-      /* Linting */
-      "css.lint.validProperties" = ["view-transition-name"];
-      "css.lint.unknownProperties" = "error";
-
-      /* Explorer/Files */
       "files.associations" = {
         "*.njk" = "nunjucks";
       };
diff --git a/home/programs/starship.nix b/home/programs/starship.nix
index 55ab6cb..fbc3fb2 100644
--- a/home/programs/starship.nix
+++ b/home/programs/starship.nix
@@ -1,94 +1,123 @@
 _: {
   programs.starship = {
     enable = true;
+    catppuccin.enable = true;
 
     enableBashIntegration = true;
     enableZshIntegration = true;
     enableFishIntegration = true;
 
     settings = {
-      command_timeout = 1000;
+      add_newline = false;
+      continuation_prompt = "[](yellow) ";
+      right_format = "$cmd_duration";
+      format = ''
+        $username\
+        $hostname\
+        $directory\
+        $git_branch\
+        $git_commit\
+        $git_state\
+        $git_metrics\
+        $git_status\
+        $docker_context\
+        $package\
+        $c\
+        $cmake\
+        $deno\
+        $elixir\
+        $golang\
+        $haskell\
+        $nodejs\
+        $php\
+        $python\
+        $rust\
+        $sudo\
+        $fill\
+        $shell\
+        $line_break\
+        $status\
+        $os\
+        $character'';
+      
+      fill.symbol = " ";
 
       character = {
-        success_symbol = "[➜](bold green)";
-        error_symbol = "[➜](bold red)";
+        success_symbol = "[](green)";
+        error_symbol = "[](red)";
+        vimcmd_symbol = "[](green)";
+      };
+      cmd_duration = {
+        min_time = 0;
+        show_milliseconds = true;
+        style = "subtext0";
+        format = "[$duration]($style)";
+      };
+
+      username = {
+        show_always = true;
+        format = "[$user]($style)@";
+      };
+
+      hostname.ssh_only = false;
+
+      directory = {
+        truncation_length = 5;
+        truncate_to_repo = false;
+        style = "blue";
+        read_only = " ";
+        read_only_style = "red";
       };
 
-      gcloud.disabled = true;
+      git_branch = {
+        symbol = "";
+        style = "mauve";
+        format = "[on $symbol $branch]($style) ";
+      };
+
+      git_status = {
+        conflicted = "";
+        ahead = ">";
+        behind = "<";
+        diverged = "#";
+        untracked = "?";
+        stashed = "≡";
+        modified = "!";
+        staged = "+";
+        renamed = "%";
+        deleted = "X";
+      };
 
-      bun.format = "[$symbol($version )]($style)";
-      cmd_duration.format = "[$duration]($style) ";
-      deno.format = "[$symbol($version )]($style)";
-      docker_context.format = "[$symbol$context]($style) ";
-      git_branch.format = "[$symbol$branch(:$remote_branch)]($style) ";
-      golang.format = "[$symbol($version )]($style)";
-      nix_shell.format = "[$symbol$state( \($name\))]($style) ";
-      nodejs.format = "[$symbol($version )]($style)";
-      package.format = "[$symbol$version]($style) ";
-      python.format = "[\${symbol}\${pyenv_prefix}(\${version} )(\($virtualenv\) )]($style)";
-      rust.format = "[$symbol($version )]($style)";
+      package = {
+        symbol = "";
+        style = "peach";
+        format = "[is $symbol $version]($style) ";
+        version_format = "v${raw}";
+        display_private = true;
+      };
 
-      aws.symbol = " ";
-      bun.symbol = "󰳮 ";
-      c.symbol = " ";
-      conda.symbol = " ";
-      directory.read_only = " 󰌾";
-      docker_context.symbol = " ";
-      git_branch.symbol = " ";
-      golang.symbol = " ";
-      haskell.symbol = " ";
-      hg_branch.symbol = " ";
-      hostname.ssh_symbol = " ";
-      java.symbol = " ";
-      memory_usage.symbol = "󰍛 ";
-      nim.symbol = "󰆥 ";
-      nix_shell.symbol = " ";
-      nodejs.symbol = " ";
-      package.symbol = "󰏗 ";
-      python.symbol = " ";
-      rust.symbol = " ";
+      nodejs = {
+        symbol = "";
+        style = "green";
+        not_capable_style = "red";
+        format = "[via $symbol $version]($style) ";
+        version_format = "v${raw}";
+      };
 
-      os.symbols = {
-        Alpaquita = " ";
-        Alpine = " ";
-        Amazon = " ";
-        Android = " ";
-        Arch = " ";
-        Artix = " ";
-        CentOS = " ";
-        Debian = " ";
-        DragonFly = " ";
-        Emscripten = " ";
-        EndeavourOS = " ";
-        Fedora = " ";
-        FreeBSD = " ";
-        Garuda = "󰛓 ";
-        Gentoo = " ";
-        HardenedBSD = "󰞌 ";
-        Illumos = "󰈸 ";
-        Linux = " ";
-        Mabox = " ";
-        Macos = " ";
-        Manjaro = " ";
-        Mariner = " ";
-        MidnightBSD = " ";
-        Mint = " ";
-        NetBSD = " ";
-        NixOS = " ";
-        OpenBSD = "󰈺 ";
-        openSUSE = " ";
-        OracleLinux = "󰌷 ";
-        Pop = " ";
-        Raspbian = " ";
-        Redhat = " ";
-        RedHatEnterprise = " ";
-        Redox = " ";
-        Solus = "󰠳 ";
-        SUSE = " ";
-        Ubuntu = " ";
-        Unknown = " ";
-        Windows = "󰍲 ";
+      golang = {
+        symbol = "󰟓";
+        style = "sky";
+        not_capable_style = "red";
+        format = "[via $symbol $version]($style) ";
+        version_format = "v${raw}";
       };
+
+      python = {
+        symbol = "󱔎";
+        style = "yellow";
+        format = "[via $symbol $version]($style) ";
+        version_format = "v${raw}";
+      }
     };
   };
 }