diff --git a/config/lsp/default.nix b/config/lsp/default.nix
index 4de196a..30173cc 100644
--- a/config/lsp/default.nix
+++ b/config/lsp/default.nix
@@ -4,8 +4,6 @@
     ./lsp.nix
     ./lspsaga.nix
     ./luasnip.nix
-    # This is conflicting (scm files) with `tree-sitter-nu`
-    # ./nushell.nix
     ./nvim-cmp.nix
   ];
 }
diff --git a/config/lsp/lsp.nix b/config/lsp/lsp.nix
index bc72c82..20d1c87 100644
--- a/config/lsp/lsp.nix
+++ b/config/lsp/lsp.nix
@@ -5,8 +5,9 @@
       servers = {
         kotlin-language-server.enable = true;
         lua-ls.enable = true;
-        nil_ls.enable = true;
         marksman.enable = true;
+        nil_ls.enable = true;
+        nushell.enable = true;
         pylsp.enable = true;
         yamlls.enable = true;
       };
diff --git a/config/lsp/nushell.nix b/config/lsp/nushell.nix
deleted file mode 100644
index d4bae04..0000000
--- a/config/lsp/nushell.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  extraPlugins = with pkgs.vimPlugins; [
-    nvim-nu
-  ];
-  extraConfigLua = ''
-    require('nu').setup{}
-  '';
-}
diff --git a/flake.lock b/flake.lock
index f84d54e..050bab8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1704152458,
-        "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
+        "lastModified": 1704982712,
+        "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
+        "rev": "07f6395285469419cf9d078f59b5b49993198c00",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704538339,
-        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
+        "lastModified": 1704722960,
+        "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
+        "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
         "type": "github"
       },
       "original": {
@@ -253,11 +253,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1704812275,
-        "narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=",
+        "lastModified": 1704958333,
+        "narHash": "sha256-yYgtaJnaDtUzd2X5jL+Zy38rtKPEu328oy5x7cOaH+I=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e",
+        "rev": "0379ab34cc7bc1b846bfdbb3d6707f5c8b03ce2c",
         "type": "github"
       },
       "original": {
@@ -305,11 +305,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1704725188,
-        "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=",
+        "lastModified": 1704913983,
+        "narHash": "sha256-K/GuHFFriQhH3VPWMhm6bYelDuPyGGjGu1OF1EWUn5k=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "ea96f0c05924341c551a797aaba8126334c505d2",
+        "rev": "b0265634df1dc584585c159b775120e637afdb41",
         "type": "github"
       },
       "original": {
@@ -360,11 +360,11 @@
     "tree-sitter-nu": {
       "flake": false,
       "locked": {
-        "lastModified": 1704462279,
-        "narHash": "sha256-4UpNY2yHJ7+gVoIXHEXpPvFztFU6EZmWbSyZFIcCvl4=",
+        "lastModified": 1704986900,
+        "narHash": "sha256-sKtKzO1kmn43ulVPW1lx1xkBL0CdKtezDJ5ix76zkbc=",
         "owner": "nushell",
         "repo": "tree-sitter-nu",
-        "rev": "26bbaecda0039df4067861ab38ea8ea169f7f5aa",
+        "rev": "2c580c25721fa191dc861f4d295391b709611bdb",
         "type": "github"
       },
       "original": {