diff --git a/roles/common/programs/helix.nix b/roles/common/programs/helix.nix
index 00f0af2..5a535fb 100644
--- a/roles/common/programs/helix.nix
+++ b/roles/common/programs/helix.nix
@@ -22,17 +22,12 @@
           indent-guides.render = true;
         };
       };
-    };
-    # The builtin languages options have issues
-    # https://github.com/nix-community/home-manager/issues/3299
-    xdg.configFile."helixLanguages" = {
-      target = "helix/languages.toml";
-      text = ''
-        [language-server.nil]
-        config.nil.formatting.command = [ "nixpkgs-fmt" ]
-        [[language]]
-        name = "nix"
-      '';
+      languages = [
+        {
+          name = "nix";
+          formatter.command = "nixpkgs-fmt";
+        }
+      ];
     };
   };
 }
diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix
index d75c465..bfd7c38 100644
--- a/roles/desktop/programs/vscode.nix
+++ b/roles/desktop/programs/vscode.nix
@@ -2,39 +2,31 @@
 let inputs = flakeSelf.inputs; in
 {
 	nixpkgs.overlays = [ inputs.catppuccin-vsc.overlays.default ];
-	home-manager.users.toast = {
-		home.packages = with pkgs; [
-			nixpkgs-fmt
+	home-manager.users.toast.programs.vscode = {
+		enable = true;
+		package = pkgs.vscodium;
+		mutableExtensionsDir = false;
+		extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [
+			jnoortheen.nix-ide
+			(pkgs.catppuccin-vsc.override {
+				workbenchMode = "flat";
+				extraBordersEnabled = true;
+			})
+			catppuccin.catppuccin-vsc-icons
+			waderyan.gitblame
 		];
-		programs.vscode = {
-			enable = true;
-			package = pkgs.vscodium;
-			mutableExtensionsDir = false;
-			extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [
-				jnoortheen.nix-ide
-				(pkgs.catppuccin-vsc.override {
-					workbenchMode = "flat";
-					extraBordersEnabled = true;
-				})
-				catppuccin.catppuccin-vsc-icons
-				waderyan.gitblame
-			];
-			userSettings = {
-				# VSCode doesn't like nested settings
-				# https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep
-				# TODO: write a function that unnests settings
-				"workbench.colorTheme" = "Catppuccin Mocha";
-				"workbench.iconTheme" = "catppuccin-mocha";
-				"editor.fontFamily" = "JetBrainsMono Nerd Font";
-				"editor.semanticHighlighting.enabled" = true;
-				"nix.enableLanguageServer" = true;
-				"nix.serverPath" = "${pkgs.nil}/bin/nil";
-				"nix.serverSettings" = {
-					"nil"."formatting"."command" = [ "nixpkgs-fmt" ];
-				};
-				"terminal.integrated.minimumContrastRatio" = 1;
-				"window.titleBarStyle" = "custom";
-			};
+		userSettings = {
+			# VSCode doesn't like nested settings
+			# https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep
+			# TODO: write a function that unnests settings
+			"workbench.colorTheme" = "Catppuccin Mocha";
+			"workbench.iconTheme" = "catppuccin-mocha";
+			"editor.fontFamily" = "JetBrainsMono Nerd Font";
+			"editor.semanticHighlighting.enabled" = true;
+			"nix.enableLanguageServer" = true;
+			"nix.serverPath" = "${pkgs.nil}/bin/nil";
+			"terminal.integrated.minimumContrastRatio" = 1;
+			"window.titleBarStyle" = "custom";
 		};
 	};
 }