diff --git a/home/shell/default.nix b/home/shell/default.nix
index d362f2e..70c1c49 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -17,7 +17,7 @@
     ./nix-output-monitor.nix
     ./nushell
     ./rip.nix
-    ./starship.nix
+    ./starship
     ./tldr.nix
     ./zellij.nix
     ./zoxide.nix
diff --git a/home/shell/starship.nix b/home/shell/starship.nix
deleted file mode 100644
index 9dcea48..0000000
--- a/home/shell/starship.nix
+++ /dev/null
@@ -1,281 +0,0 @@
-{...}: {
-  programs.starship = {
-    enable = true;
-    settings = {
-      add_newline = false;
-      character = {
-        success_symbol = "[>](bold green)";
-        error_symbol = "[x](bold red)";
-        vimcmd_symbol = "[<](bold green)";
-      };
-
-      git_commit = {
-        tag_symbol = " tag ";
-      };
-
-      git_status = {
-        ahead = ">";
-        behind = "<";
-        diverged = "<>";
-        renamed = "r";
-        deleted = "x";
-      };
-
-      aws = {
-        symbol = "aws ";
-      };
-
-      azure = {
-        symbol = "az ";
-      };
-
-      bun = {
-        symbol = "bun ";
-      };
-
-      c = {
-        symbol = "C ";
-      };
-
-      cobol = {
-        symbol = "cobol ";
-      };
-
-      conda = {
-        symbol = "conda ";
-      };
-
-      crystal = {
-        symbol = "cr ";
-      };
-
-      cmake = {
-        symbol = "cmake ";
-      };
-
-      daml = {
-        symbol = "daml ";
-      };
-
-      dart = {
-        symbol = "dart ";
-      };
-
-      deno = {
-        symbol = "deno ";
-      };
-
-      dotnet = {
-        symbol = ".NET ";
-      };
-
-      directory = {
-        read_only = " ro";
-      };
-
-      docker_context = {
-        symbol = "docker ";
-      };
-
-      elixir = {
-        symbol = "exs ";
-      };
-
-      elm = {
-        symbol = "elm ";
-      };
-
-      fennel = {
-        symbol = "fnl ";
-      };
-
-      fossil_branch = {
-        symbol = "fossil ";
-      };
-
-      gcloud = {
-        symbol = "gcp ";
-      };
-
-      git_branch = {
-        symbol = "git ";
-      };
-
-      golang = {
-        symbol = "go ";
-      };
-
-      gradle = {
-        symbol = "gradle ";
-      };
-
-      guix_shell = {
-        symbol = "guix ";
-      };
-
-      hg_branch = {
-        symbol = "hg ";
-      };
-
-      java = {
-        symbol = "java ";
-      };
-
-      julia = {
-        symbol = "jl ";
-      };
-
-      kotlin = {
-        symbol = "kt ";
-      };
-
-      lua = {
-        symbol = "lua ";
-      };
-
-      nodejs = {
-        symbol = "nodejs ";
-      };
-
-      memory_usage = {
-        symbol = "memory ";
-      };
-
-      meson = {
-        symbol = "meson ";
-      };
-
-      nim = {
-        symbol = "nim ";
-      };
-
-      nix_shell = {
-        symbol = "nix ";
-      };
-
-      ocaml = {
-        symbol = "ml ";
-      };
-
-      opa = {
-        symbol = "opa ";
-      };
-
-      os.symbols = {
-        Alpaquita = "alq ";
-        Alpine = "alp ";
-        Amazon = "amz ";
-        Android = "andr ";
-        Arch = "rch ";
-        Artix = "atx ";
-        CentOS = "cent ";
-        Debian = "deb ";
-        DragonFly = "dfbsd ";
-        Emscripten = "emsc ";
-        EndeavourOS = "ndev ";
-        Fedora = "fed ";
-        FreeBSD = "fbsd ";
-        Garuda = "garu ";
-        Gentoo = "gent ";
-        HardenedBSD = "hbsd ";
-        Illumos = "lum ";
-        Linux = "lnx ";
-        Mabox = "mbox ";
-        Macos = "mac ";
-        Manjaro = "mjo ";
-        Mariner = "mrn ";
-        MidnightBSD = "mid ";
-        Mint = "mint ";
-        NetBSD = "nbsd ";
-        NixOS = "nix ";
-        OpenBSD = "obsd ";
-        OpenCloudOS = "ocos ";
-        openEuler = "oeul ";
-        openSUSE = "osuse ";
-        OracleLinux = "orac ";
-        Pop = "pop ";
-        Raspbian = "rasp ";
-        Redhat = "rhl ";
-        RedHatEnterprise = "rhel ";
-        Redox = "redox ";
-        Solus = "sol ";
-        SUSE = "suse ";
-        Ubuntu = "ubnt ";
-        Unknown = "unk ";
-        Windows = "win ";
-      };
-
-      package = {
-        symbol = "pkg ";
-      };
-
-      perl = {
-        symbol = "pl ";
-      };
-
-      php = {
-        symbol = "php ";
-      };
-
-      pijul_channel = {
-        symbol = "pijul ";
-      };
-
-      pulumi = {
-        symbol = "pulumi ";
-      };
-
-      purescript = {
-        symbol = "purs ";
-      };
-
-      python = {
-        symbol = "py ";
-      };
-
-      raku = {
-        symbol = "raku ";
-      };
-
-      ruby = {
-        symbol = "rb ";
-      };
-
-      rust = {
-        symbol = "rs ";
-      };
-
-      scala = {
-        symbol = "scala ";
-      };
-
-      spack = {
-        symbol = "spack ";
-      };
-
-      solidity = {
-        symbol = "solidity ";
-      };
-
-      status = {
-        symbol = "x = {(bold red) ";
-      };
-
-      sudo = {
-        symbol = "sudo ";
-      };
-
-      swift = {
-        symbol = "swift ";
-      };
-
-      terraform = {
-        symbol = "terraform ";
-      };
-
-      zig = {
-        symbol = "zig ";
-      };
-    };
-  };
-}
diff --git a/home/shell/starship/default.nix b/home/shell/starship/default.nix
new file mode 100644
index 0000000..1faf82b
--- /dev/null
+++ b/home/shell/starship/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.starship = {
+    enable = true;
+    settings = builtins.fromTOML (builtins.readFile ./theme.toml);
+  };
+}
diff --git a/home/shell/starship/theme.toml b/home/shell/starship/theme.toml
new file mode 100644
index 0000000..9e186d0
--- /dev/null
+++ b/home/shell/starship/theme.toml
@@ -0,0 +1,62 @@
+add_newline = false
+# A minimal left prompt
+format = """$directory$character"""
+palette = "catppuccin_mocha"
+# move the rest of the prompt to the right
+right_format = """$all"""
+command_timeout = 1000
+
+[directory.substitutions]
+'~/tests/starship-custom' = 'work-project'
+
+[git_branch]
+format =  '[$symbol$branch(:$remote_branch)]($style)'
+
+[aws]
+format = '[$symbol(profile: "$profile" )(\(region: $region\) )]($style)'
+disabled = false
+style = 'bold blue'
+symbol = " "
+
+[golang]
+format = '[ ](bold cyan)'
+
+[kubernetes]
+symbol = '☸ '
+disabled = true
+detect_files = ['Dockerfile']
+format = '[$symbol$context( \($namespace\))]($style) '
+contexts = [
+  { context_pattern = "arn:aws:eks:us-west-2:577926974532:cluster/zd-pvc-omer", style = "green", context_alias = "omerxx", symbol = " " },
+]
+
+[docker_context]
+disabled = true
+
+[palettes.catppuccin_mocha]
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"
\ No newline at end of file
diff --git a/modules/system.nix b/modules/system.nix
index 7d5bee1..bf446cd 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -69,7 +69,7 @@
     description = "panotaka";
     extraGroups = ["networkmanager" "wheel" "libvirtd"];
     initialPassword = "panotaka";
-    shell = pkgs.fish;
+    shell = pkgs.nu;
     openssh.authorizedKeys.keys = [
     ];
   };