diff --git a/home/common.nix b/home/common.nix
index 4a30ded..549f8ee 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -1,38 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  texlab = pkgs.rustPlatform.buildRustPackage rec {
-    pname = "texlab";
-    version = "5.7.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "latex-lsp";
-      repo = "texlab";
-      rev = "refs/tags/v${version}";
-      sha256 = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg=";
-    };
-
-    cargoSha256 = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM=";
-
-    outputs = [ "out" "man" ];
-
-    nativeBuildInputs = with pkgs; [ installShellFiles help2man ];
-
-    buildInputs = lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-      libiconv
-      Security
-      CoreServices
-    ]);
-
-    # When we cross compile we cannot run the output executable to
-    # generate the man page
-    postInstall = ''
-      # TexLab builds man page separately in CI:
-      # https://github.com/latex-lsp/texlab/blob/v5.7.0/.github/workflows/publish.yml#L127-L131
-      help2man --no-info "$out/bin/texlab" > texlab.1
-      installManPage texlab.1
-    '';
-  };
+  texlab = pkgs.unstable.texlab;
 in
 {
   imports = [
@@ -43,6 +12,13 @@ in
     ./modules/programs/my-kitty
     ./modules/programs/openconnect-epfl.nix
     ./common-linux.nix
+
+    # PATH Overrides
+    ({ config, lib, ... }: {
+      home.sessionPath = lib.mkBefore [
+        "${config.home.homeDirectory}/.bin/overrides"
+      ];
+    })
   ];
 
   # Let Home Manager install and manage itself.
@@ -114,8 +90,6 @@ in
     BAT_THEME = "GitHub";
     # Editor
     EDITOR = "kak";
-    # PATH Overrides
-    PATH = "${config.home.homeDirectory}/.bin/overrides:$PATH";
   };
 
   home.sessionPath = [
diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index 907efcf..45ebefb 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -141,7 +141,10 @@ in
           owner = "tree-sitter";
           repo = "tree-sitter-scala";
           rev = "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203";
-          sha256 = "sha256-G83H3RJddeIdLT6JssIDD5KXVnZE6vk1chl3RpQjdCI=";
+          sha256 =
+            if pkgs.stdenv.isDarwin
+            then "sha256-Ff8vRw7UswvPRGQS6nlSxqz46pX4eLNckuSbqa1yvtA="
+            else "sha256-G83H3RJddeIdLT6JssIDD5KXVnZE6vk1chl3RpQjdCI=";
           leaveDotGit = true;
         };
       in
@@ -156,7 +159,10 @@ in
           owner = "tree-sitter";
           repo = "tree-sitter-haskell";
           rev = "ba0bfb0e5d8e9e31c160d287878c6f26add3ec08";
-          sha256 = "sha256-nocX9L8vD655nzky4PQulygWAjKGC1rh3SYDr7t4wBQ=";
+          sha256 =
+            if pkgs.stdenv.isDarwin
+            then "sha256-lW3E4gSZV/m2RfofUqeiCu8KDz06YEvXbYKs8smXFi4="
+            else "sha256-nocX9L8vD655nzky4PQulygWAjKGC1rh3SYDr7t4wBQ=";
           leaveDotGit = true;
         };
       in