diff --git a/modules/applications/emacs/company-tabnine.patch b/modules/applications/emacs/company-tabnine.patch
deleted file mode 100644
index f591b0b..0000000
--- a/modules/applications/emacs/company-tabnine.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/company-tabnine.el b/company-tabnine.el
---- a/company-tabnine.el	1970-01-01 03:00:01.000000000 +0300
-+++ b/company-tabnine.el	2021-04-22 14:34:13.329024811 +0300
-@@ -376,7 +376,7 @@
-            :sentinel #'company-tabnine--process-sentinel
-            :noquery t)))
-   ;; hook setup
--  (message "TabNine server started.")
-+  ;; (message "TabNine server started.")
-   (dolist (hook company-tabnine--hooks-alist)
-     (add-hook (car hook) (cdr hook))))
-
-@@ -475,17 +475,17 @@
-   (when (and company-tabnine--process
-              (memq (process-status process) '(exit signal)))
-
--    (message "TabNine process %s received event %s."
--             (prin1-to-string process)
--             (prin1-to-string event))
-+    ;; (message "TabNine process %s received event %s."
-+             ;; (prin1-to-string process)
-+             ;; (prin1-to-string event))
-
-     (if (>= company-tabnine--restart-count
-             company-tabnine-max-restart-count)
-         (progn
--          (message "TabNine process restart limit reached.")
-+          ;; (message "TabNine process restart limit reached.")
-           (setq company-tabnine--process nil))
-
--      (message "Restarting TabNine process.")
-+      ;; (message "Restarting TabNine process.")
-       (company-tabnine-start-process)
-       (setq company-tabnine--restart-count
-             (1+ company-tabnine--restart-count)))))
-
diff --git a/modules/applications/emacs/default.nix b/modules/applications/emacs/default.nix
index c9bc4ce..cf58c78 100644
--- a/modules/applications/emacs/default.nix
+++ b/modules/applications/emacs/default.nix
@@ -24,7 +24,6 @@ in {
           use-package
           nix-mode
           haskell-mode
-          wakib-keys
           exec-path-from-shell
           counsel
           projectile
@@ -39,11 +38,7 @@ in {
           flycheck
           flycheck-pkg-config
           auto-indent-mode
-          clipmon
-          org-gcal
           company-ghci
-          (company-tabnine.overrideAttrs
-            (_: { patches = [ ./company-tabnine.patch ]; }))
           expand-region
           ivy
           smex
@@ -62,14 +57,15 @@ in {
           gitlab
           undo-tree
           rust-mode
-          go-mode
           edit-indirect
           idris-mode
           lsp-mode
-          org-caldav
           envrc
           lsp-haskell
-          crdt
+          treemacs
+          lsp-treemacs
+          treemacs-projectile
+          dap-mode
         ];
     };
 
diff --git a/modules/applications/emacs/init.el b/modules/applications/emacs/init.el
index db9dc95..28b1efe 100755
--- a/modules/applications/emacs/init.el
+++ b/modules/applications/emacs/init.el
@@ -160,9 +160,6 @@ If point was already at that position, move point to beginning of line."
 (use-package company-box
   :hook (company-mode . company-box-mode))
 
-(use-package company-tabnine
-  :config
-  (push 'company-tabnine company-backends))
 
 ;; -------------------
 ;; Ivy
@@ -227,20 +224,19 @@ If point was already at that position, move point to beginning of line."
   (add-hook 'haskell-mode-hook 'lsp)
   (add-hook 'haskell-literate-mode-hook 'lsp)
   )
-(use-package org-caldav
-  :config
-  (setq org-caldav-url "https://nextcloud.balsoft.ru/remote.php/dav/calendars/balsoft")
-  (setq org-caldav-calendar-id "work")
-  (setq org-caldav-inbox "/home/balsoft/Documents/Work/calendar.org")
-  (setq org-icalendar-timezone "Europe/Moscow")
-  )
 
 (use-package envrc
   :config
   (envrc-global-mode)
   (advice-add 'lsp :before (lambda (&optional n) (envrc--update))))
 
-(use-package crdt)
+(setq treemacs-position 'right)
+
+(use-package treemacs)
+
+(use-package lsp-treemacs)
+
+(use-package treemacs-projectile)
 
 (load-theme 'manoj-dark t)
 ;;; init.el ends here