diff --git a/nix/core.nix b/nix/core.nix
index a48e0b3..50dfa71 100644
--- a/nix/core.nix
+++ b/nix/core.nix
@@ -73,6 +73,11 @@
     # Rust
     cargo
 
+    # Nix
+    nil
+    nixfmt-rfc-style
+    nix-prefetch-scripts
+
     # Shell
     zsh
     shfmt
@@ -103,6 +108,8 @@
     talosctl
     cilium-cli
     kubelogin-oidc
+    kubebuilder
+    chart-testing
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/nvim/lua/code_helpers.lua b/nvim/lua/code_helpers.lua
index db1b701..8006a60 100644
--- a/nvim/lua/code_helpers.lua
+++ b/nvim/lua/code_helpers.lua
@@ -156,6 +156,7 @@ require("mason-lspconfig").setup({
 		"terraformls", -- terraform
 		"tflint", -- terraform
 		"yamlls", -- yaml
+		"nil_ls", -- nix
 	},
 	automatic_installation = true,
 })
@@ -240,6 +241,9 @@ require("formatter").setup({
 		proto = {
 			require("formatter.filetypes.proto").buf_format,
 		},
+		nix = {
+			require("formatter.filetypes.nix").nixfmt,
+		},
 		terraform = {
 			--require("formatter.filetypes.terraform").terraformfmt,
 			function()