diff --git a/nvim/.config/nvim/lua/core/languages.lua b/nvim/.config/nvim/lua/core/languages.lua
index b1214d2..ad2b5bb 100644
--- a/nvim/.config/nvim/lua/core/languages.lua
+++ b/nvim/.config/nvim/lua/core/languages.lua
@@ -6,6 +6,12 @@
 --
 -- with their respective names used by lspconfig, nvim-treesitter, nvim-lint and conform.
 --
+
+local nushell = { lsp = { nushell = {} }, ts = { "nu" } }
+if vim.fn.executable("nufmt") == 1 then
+	nushell.format = {nu = {"nufmt"}}
+end
+
 local languages = {
 	arduino = { lsp = { arduino_language_server = {} }, ts = { "arduino" } },
 	awk = { ts = { "awk" }, format = { awk = { "gawk" } } },
@@ -80,7 +86,7 @@ local languages = {
 		format = { markdown = { "prettier", "injected" } },
 	},
 	nim = { lsp = { nim_langserver = {} }, ts = { "nim", "nim_format_string" }, format = { nim = { "nimpretty" } } },
-	nushell = { ts = { "nu" } },
+	nu = nushell,
 	python = {
 		lsp = { basedpyright = {}, ruff = {} },
 		ts = { "python" },
diff --git a/terminal/.config/starship.toml b/terminal/.config/starship.toml
index a7b888f..625330c 100644
--- a/terminal/.config/starship.toml
+++ b/terminal/.config/starship.toml
@@ -1,3 +1,6 @@
+# Get editor completions based on the config schema
+"$schema" = 'https://starship.rs/config-schema.json'
+
 format = """
 $sudo\
 $username\