diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix
index 3b7acab..b5cc94d 100644
--- a/nixos/msi/configuration.nix
+++ b/nixos/msi/configuration.nix
@@ -14,9 +14,6 @@ let
 
 		# Neovim
 		wl-clipboard
-		tree-sitter
-		ripgrep
-		fd
 		unzip
 		neovim
 	];
diff --git a/nixos/msi/home.nix b/nixos/msi/home.nix
index 71612d7..479e9ac 100644
--- a/nixos/msi/home.nix
+++ b/nixos/msi/home.nix
@@ -16,12 +16,19 @@
 		packages = with pkgs; [
 			anki
 			audacity
+			calibre
+			chromium
 			discord
 			krita
 			obs-studio
 			qbittorrent
-			spotify
 			vlc
+
+			# OCaml
+			ocaml
+			ocamlformat
+			opam
+			dune_3
 		];
 	};
 
@@ -34,7 +41,15 @@
 
 	programs = {
 		# default shell
-		fish.enable = true;
+		fish = {
+			enable = true;
+			interactiveShellInit = ''
+				set fish_greeting # Disable greeting
+			'';
+			shellAliases = {
+				shell = "nix-shell --command fish";
+			};
+		};
 
 		git = {
 			enable = true;
@@ -75,8 +90,19 @@
 			enable = true;
 			defaultEditor = true;
 			extraPackages = with pkgs; [
-				lua-language-server
-				nixd
+				fd
+				ripgrep
+				tree-sitter
+
+				# LSP
+				lua-language-server                         # lua
+				marksman                                    # markdown
+				nixd                                        # nix
+				nodePackages.svelte-language-server         # svelte
+				nodePackages.typescript-language-server     # typescript
+				ocamlPackages.ocaml-lsp                     # ocaml
+				vscode-langservers-extracted                # css/html/json
+
 				lldb
 			];
 		};