diff --git a/flake.nix b/flake.nix
index 8d76437..60280b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,8 @@
 
         llama-cpp.url = "github:ggerganov/llama.cpp";
 
+        nix-matlab.url = "gitlab:doronbehar/nix-matlab";
+
     };
 
     outputs = inputs@{ self
@@ -28,6 +30,7 @@
                      , flake-utils
                      , sops-nix
                      , llama-cpp
+                     , nix-matlab
                      , ...
                      }:
         let
@@ -234,7 +237,7 @@
 
                     pkgs = import nixpkgs {
                         inherit system;
-                        overlays = with overlays; [ printrun shadps4 ];
+                        overlays = with overlays; [ printrun shadps4 nix-matlab.overlay ];
                         config = {
                           allowUnfree = true;
                           permittedInsecurePackages = [
diff --git a/hosts/alpheratz/system.nix b/hosts/alpheratz/system.nix
index fa33720..da39f59 100644
--- a/hosts/alpheratz/system.nix
+++ b/hosts/alpheratz/system.nix
@@ -65,8 +65,10 @@
     environment.systemPackages = with pkgs; [
         localPackages.x86_64-linux.jhelioviewer
         bottles
+        matlab
         discord
         wine
+        matlab-language-server
     ];
 
     services.printing.enable = false;
diff --git a/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua b/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua
index 25ed3e4..2e4cd09 100644
--- a/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua
@@ -14,6 +14,14 @@ iron.setup {
       python = {
         command = { "python3" },  -- or { "ipython", "--no-autoindent" }
         format = require("iron.fts.common").bracketed_paste_python
+      },
+      matlab = {
+        command = { 
+            "matlab",
+            "-nosplash",
+            "-nodesktop"
+        },
+        
       }
     },
     -- How the repl window will be displayed
diff --git a/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua b/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua
index e9f9da0..120d790 100644
--- a/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua
@@ -24,6 +24,16 @@ lspconfig.rust_analyzer.setup {
     },
 }
 
+lspconfig.matlab_ls.setup {
+    capabilities = capabilities,
+    settings = {
+        MATLAB = {
+            indexWorkspace = false,
+            installPath = "",
+        },
+    },
+}
+
 lspconfig.omnisharp.setup {
     cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"}
 }