diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix
index b5cc94d..b2bc79b 100644
--- a/nixos/msi/configuration.nix
+++ b/nixos/msi/configuration.nix
@@ -84,7 +84,6 @@ in
 	# services.printing.enable = true;
 
 	# Enable sound.
-	sound.enable = true;
 	security.rtkit.enable = true;
 	services.pipewire = {
 		enable = true;
diff --git a/nixos/msi/home.nix b/nixos/msi/home.nix
index 479e9ac..9fccb6f 100644
--- a/nixos/msi/home.nix
+++ b/nixos/msi/home.nix
@@ -2,8 +2,10 @@
 
 {
 	imports = [
-		./gaming.nix
-		./ghci
+		./modules/gaming.nix
+		./modules/ghci
+		./modules/lean.nix
+		./modules/ocaml.nix
 	];
 
 	home = {
@@ -22,13 +24,8 @@
 			krita
 			obs-studio
 			qbittorrent
+			unrar
 			vlc
-
-			# OCaml
-			ocaml
-			ocamlformat
-			opam
-			dune_3
 		];
 	};
 
@@ -47,7 +44,8 @@
 				set fish_greeting # Disable greeting
 			'';
 			shellAliases = {
-				shell = "nix-shell --command fish";
+				shell   = "nix-shell --command fish";
+				upgrade = "sudo nixos-rebuild switch --upgrade";
 			};
 		};
 
diff --git a/nixos/msi/gaming.nix b/nixos/msi/modules/gaming.nix
similarity index 100%
rename from nixos/msi/gaming.nix
rename to nixos/msi/modules/gaming.nix
diff --git a/nixos/msi/ghci/.ghci b/nixos/msi/modules/ghci/.ghci
similarity index 100%
rename from nixos/msi/ghci/.ghci
rename to nixos/msi/modules/ghci/.ghci
diff --git a/nixos/msi/ghci/default.nix b/nixos/msi/modules/ghci/default.nix
similarity index 100%
rename from nixos/msi/ghci/default.nix
rename to nixos/msi/modules/ghci/default.nix
diff --git a/nixos/msi/modules/lean.nix b/nixos/msi/modules/lean.nix
new file mode 100644
index 0000000..1e6ff7b
--- /dev/null
+++ b/nixos/msi/modules/lean.nix
@@ -0,0 +1,11 @@
+{ pkgs, config, ... }:
+
+{
+	home.packages = with pkgs; [
+		elan
+	];
+
+	# home.sessionVariables = {
+	# 	ELAN_HOME = "${config.xdg.cacheHome}/elan";
+	# };
+}
diff --git a/nixos/msi/modules/ocaml.nix b/nixos/msi/modules/ocaml.nix
new file mode 100644
index 0000000..fefa6bd
--- /dev/null
+++ b/nixos/msi/modules/ocaml.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+	home.packages = with pkgs; [
+		ocaml
+		ocamlformat
+		opam
+		dune_3
+	];
+}