diff --git a/init.el b/init.el
index bf43d91..bb668fa 100644
--- a/init.el
+++ b/init.el
@@ -81,7 +81,8 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(safe-local-variable-values
-   '((cider-clojure-cli-aliases . "dev")
+   '((lsp-enabled-clients sorbet-ls)
+     (cider-clojure-cli-aliases . "dev")
      (lsp-elixir-project-dir . "/Users/maciej/Development/mindvalley/connect/app")
      (lsp-lens-mode)
      (lsp-lens-enable)
diff --git a/lang/ruby.el b/lang/ruby.el
index dc37ec3..5ddb780 100644
--- a/lang/ruby.el
+++ b/lang/ruby.el
@@ -25,8 +25,6 @@
   ;; Do not insert magic encoding comment at the begining of each file
   (setq ruby-insert-encoding-magic-comment nil)
 
-  (lsp)
-
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
                '(company-capf company-yasnippet)))
@@ -37,6 +35,7 @@
 (eval-after-load 'rspec-mode
   '(rspec-install-snippets))
 (add-hook 'enh-ruby-mode-hook 'activate-ruby-mode)
+(add-hook 'enh-ruby-mode-hook 'lsp-deferred)
 
 (provide '+custom-lang-ruby)
 ;;; ruby.el ends here
diff --git a/pkg/base.el b/pkg/base.el
index 92f2d51..9d535cc 100644
--- a/pkg/base.el
+++ b/pkg/base.el
@@ -86,6 +86,12 @@
 ;; Numbers are arbitrary, but work on a large screen. Default is 160
 (setq split-width-threshold 180)
 
+;;;;;;;;;;;;;;;;;;;;;; Tree sitter ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-package tree-sitter :straight t)
+(use-package tree-sitter-langs :straight t)
+(global-tree-sitter-mode)
+(add-hook 'tree-sitter-after-on-hook 'tree-sitter-hl-mode)
+
 ;;;;;;;;;;;;;;;;;;;;;; Shell stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)