diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 7411a5c..e0f44cd 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -34,7 +34,7 @@
   console = {
     font = "ter-v28n";
     keyMap = "de-latin1-nodeadkeys";
-    packages = pkgs.terminus_font;
+    packages = with pkgs; [terminus_font];
   };
 
   environment.systemPackages = with pkgs; [wireguard-tools powertop];
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 9232051..bdaea38 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -69,7 +69,7 @@ in {
   system = {
     extraSystemBuilderCmds = ''
       ln -sv ${pkgs.path} $out/nixpkgs
-      ln -sv ${../nix/overlays} $out/overlays
+      ln -sv ${../../nix/overlays} $out/overlays
     '';
 
     stateVersion = "22.11";
diff --git a/modules/core/issue.nix b/modules/core/issue.nix
index 5d8abea..d089afa 100644
--- a/modules/core/issue.nix
+++ b/modules/core/issue.nix
@@ -2,6 +2,7 @@ let
   issue_text = ''
     \d  \t
     This is \e{cyan}\n\e{reset} [\e{lightblue}\l\e{reset}] (\s \m \r)
+
   '';
 in {
   environment.etc."issue".text = issue_text;
diff --git a/users/common/htop.nix b/users/common/htop.nix
index 0162702..9a939cc 100644
--- a/users/common/htop.nix
+++ b/users/common/htop.nix
@@ -3,11 +3,13 @@
     enable = true;
     settings =
       {
+        tree_view = 1;
         highlight_base_name = 1;
         show_cpu_frequency = 1;
         show_cpu_temperature = 1;
         hide_kernel_threads = 1;
         hide_userland_threads = 1;
+        sort_key = 46; # Sort by %CPU if not in tree mode
       }
       // (with config.lib.htop;
         leftMeters [
diff --git a/users/common/starship.nix b/users/common/starship.nix
index 039208c..b542c18 100644
--- a/users/common/starship.nix
+++ b/users/common/starship.nix
@@ -15,15 +15,78 @@
         "$character"
       ];
       right_format = lib.concatStrings [
+        "$status"
         "$cmd_duration"
+        "$jobs"
         "$package"
-        "$haskell"
         "$python"
         "$rust"
         "$nix_shell"
-        "$line_break"
-        "$jobs"
+        "$time"
       ];
+
+      username = {
+        format = "[$user]($style) ";
+        style_root = "red";
+        style_user = "cyan";
+      };
+      hostname = {
+        format = "[$ssh_symbol$hostname]($style) ";
+        ssh_only = false;
+        ssh_symbol = "🌐";
+        style = "cyan";
+      };
+      directory = {
+        fish_style_pwd_dir_length = 1;
+        style = "bold blue";
+      };
+      character = {
+        success_symbol = "\\$";
+        error_symbol = "\\$";
+        vimcmd_symbol = "[](bold green)";
+        vimcmd_replace_one_symbol = "[](bold purple)";
+        vimcmd_replace_symbol = "[](bold purple)";
+        vimcmd_visual_symbol = "[](bold yellow)";
+      };
+      git_branch = {
+        format = "[$symbol$branch]($style) ";
+        symbol = " ";
+        style = "green";
+      };
+      git_commit = {
+        commit_hash_length = 8;
+        format = "[$hash$tag]($style) ";
+        style = "green";
+      };
+      git_status = {
+        conflicted = "$count ";
+        ahead = "⇡$count ";
+        behind = "⇣$count ";
+        diverged = "⇡$ahead_count⇣$behind_count ";
+        untracked = "?$count ";
+        stashed = "\\$$count ";
+        modified = "!$count ";
+        staged = "+$count ";
+        renamed = "→$count ";
+        deleted = "-$count ";
+        format = "[$conflicted](red)[$stashed](magenta)[$staged](green)[$deleted](red)[$renamed](blue)[$modified](yellow)[$untracked](yellow)[$ahead_behind](green)";
+      };
+      status = {
+        pipestatus = true;
+        disabled = false;
+        pipestatus_format = "$pipestatus => [$symbol$common_meaning$signal_name$maybe_int]($style)";
+        pipestatus_segment_format = "[$symbol$status]($style)";
+        format = "[$symbol$status$signal_name]($style)";
+      };
+      cmd_duration = {
+        format = "[ $duration]($style) ";
+        style = "yellow";
+      };
+      time = {
+        format = "[ $time]($style) ";
+        style = "cyan";
+        disabled = false;
+      };
     };
   };
 }