diff --git a/.gitignore b/.gitignore
index f7347f8..ff1cae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ eshell/*
 .yas-compiled-snippets.el
 ac-comphist.dat
 /.cache
+.dap-breakpoints
diff --git a/init.el b/init.el
index 4ae106f..9a197bf 100644
--- a/init.el
+++ b/init.el
@@ -37,6 +37,7 @@
 (require 'pkg/deft "$HOME/.emacs.d/pkg/deft.el")
 (require 'pkg/lsp "$HOME/.emacs.d/pkg/lsp.el")
 (require 'pkg/dashboard "$HOME/.emacs.d/pkg/dashboard.el")
+(require 'pkg/undo-tree "$HOME/.emacs.d/pkg/undo-tree.el")
 
 ;; Themes
 (require 'themes/themes "$HOME/.emacs.d/themes/themes.el")
@@ -64,7 +65,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(undo-tree helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))
+   '(dap-mode undo-tree helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))
  '(safe-local-variable-values
    '((haskell-process-use-ghci . t)
      (haskell-indent-spaces . 4))))
diff --git a/pkg/lsp.el b/pkg/lsp.el
index aecd235..eb9cb30 100644
--- a/pkg/lsp.el
+++ b/pkg/lsp.el
@@ -29,5 +29,11 @@
       lsp-ui-doc-include-signature t
       lsp-log-io nil)
 
+;; Lsp debugger mode
+(use-package dap-mode
+  :ensure t
+  :defer t
+  :requires (lsp-mode lsp-ui))
+
 (provide 'pkg/lsp)
 ;;; lsp.el ends here