Removing undo-tree and other little changes

init.el

@@ -168,10 +168,10 @@
         evil-want-C-i-jump nil
         evil-want-C-u-scroll t
         evil-respect-visual-line-mode t
-        evil-want-C-u-delete t)
+        evil-want-C-u-delete t
+	evil-undo-system 'undo-redo)
   :config
-  (evil-mode +1)
-  (setq evil-undo-system 'undo-tree))
+  (evil-mode +1))
 
 (use-package evil-collection
   :after evil
@@ -233,14 +233,21 @@
   :config
   (global-evil-surround-mode +1))
 
-(use-package undo-tree
-  :after evil
+(use-package unicode-fonts
+  :ensure t
   :config
-  (global-undo-tree-mode +1)
+  (unicode-fonts-setup))
+
+(use-package emojify
+  :ensure t
+  :hook (after-init . global-emojify-mode)
+  :config
+  (setq emojify-display-style 'image)
   :general
-  (general-def 'normal undo-tree-visualize-mode-map
-   "j" 'undo-tree-visualize-redo
-   "k" 'undo-tree-visualize-undo))
+  (chris/leader-keys
+    :states 'normal
+    :keymaps 'override
+    "se" '(emojify-insert-emoji :which-key "insert emoji")))
 
 (use-package visual-fill-column
   :after org
@@ -327,10 +334,12 @@ vertically."
 
 (use-package company
   :defer 1
-  :config (global-company-mode +1))
+  :config
+  (global-company-mode +1)
+  (setq company-dabbrev-other-buffers t))
 
 (use-package company-dict
-  :defer t)
+  :after company)
 
 (use-package avy
   :after evil)
@@ -348,6 +357,22 @@ vertically."
 (use-package ace-link
   :after avy)
 
+(setq display-buffer-alist
+      '(("\\*e?shell\\*"
+	 (display-buffer-pop-up-frame))
+	("*helpful*"
+	 (display-buffer-pop-up-frame))
+	("*elfeed-entry*"
+	 (display-buffer-pop-up-frame))
+	("*Bongo-Elfeed Queue*"
+	 (display-buffer-pop-up-frame))))
+
+(defun chris/kill-buffer-frame ()
+  "Kills the active buffer and frame"
+  (interactive)
+  (kill-this-buffer)
+  (delete-frame))
+
 (use-package helpful
   :commands (helpful-callable helpful-variable helpful-command helpful-key)
   :general
@@ -466,8 +491,11 @@ vertically."
   (org-babel-do-load-languages 'org-babel-load-languages
 			       '((emacs-lisp . t)
 				 (python . t)
+				 (ditaa . t)
 				 (shell . t)))
 
+  (setq org-ditaa-jar-path "/usr/bin/ditaa")
+
   (require 'org-tempo)
   (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
   (add-to-list 'org-structure-template-alist '("py" . "src python"))
@@ -575,6 +603,7 @@ vertically."
 		  org-document-info-keyword
 		  org-meta-line
 		  org-table
+		  org-date
 		  org-verbatim))
     (set-face-attribute `,face nil :inherit 'fixed-pitch))
   
@@ -583,6 +612,8 @@ vertically."
 
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))
 
+  (setq org-agenda-window-setup 'other-frame)
+
   :general
   (chris/leader-keys
     :states 'normal
@@ -1140,6 +1171,20 @@ If on a:
   (general-def '(normal insert) eshell-mode-map
     "C-d" 'chris/kill-buffer-frame))
 
+(setq eshell-command-aliases-list
+      '(("ls" "exa $1")
+        ("la" "exa -la $1")
+        ("q" "exit")
+        ("f" "find-file $1")
+        ("ff" "find-file $1")
+        ("d" "dired $1")
+        ("bd" "eshell-up $1")
+        ("rg" "rg --color=always $*")
+        ("ll" "ls -lah $*")
+        ("gg" "magit-status")
+        ("clear" "clear-scrollback")
+        ("!c" "eshell-previous-input 2")))
+
 (use-package sly
   :mode ("\\.lisp\\'" . sly-mode))
 
@@ -1156,22 +1201,6 @@ If on a:
   :config
   (add-hook 'nov-mode-hook 'olivetti-mode))
 
-(setq display-buffer-alist
-      '(("\\*e?shell\\*"
-	 (display-buffer-pop-up-frame))
-	("*helpful*"
-	 (display-buffer-pop-up-frame))
-	("*elfeed-entry*"
-	 (display-buffer-pop-up-frame))
-	("*Bongo-Elfeed Queue*"
-	 (display-buffer-pop-up-frame))))
-
-(defun chris/kill-buffer-frame ()
-  "Kills the active buffer and frame"
-  (interactive)
-  (kill-this-buffer)
-  (delete-frame))
-
 (use-package elfeed
   :commands (elfeed)
   :config
@@ -1335,3 +1364,5 @@ interfere with the default `bongo-playlist-buffer'."
   (setq gcmh-idle-delay 5
 	gcmh-high-cons-threshold (* 128 1024 1024)  ; 128mb
 	gcmh-verbose t))
+
+(setq warning-suppress-types '((comp)))