1 files changed, 35 insertions, 53 deletions

diff --git a/.emacs.d/jd/jd-ui.el b/.emacs.d/jd/jd-ui.el
index f3a39bc..ccaf369 100755
--- a/.emacs.d/jd/jd-ui.el
+++ b/.emacs.d/jd/jd-ui.el
@@ -29,31 +29,25 @@
 
 (require 'diminish)
 
-(jd/use-package doom-modeline  "emacs-doom-modeline"
-                :config
-                (doom-modeline-mode))
+(use-package! doom-modeline  "emacs-doom-modeline"
+  :config
+  (doom-modeline-mode))
 
-(jd/use-package solarized-theme  "emacs-solarized-theme"
-                :config
-                (load-theme 'solarized-dark-high-contrast t))
+(use-package! solarized-theme  "emacs-solarized-theme"
+  :config
+  (load-theme 'solarized-dark-high-contrast t))
 
 
-(jd/use-package diminish "emacs-diminish")
+(use-package! diminish "emacs-diminish")
 
-(jd/use-package hl-todo "emacs-hl-todo"
-                :init
-                (setq hl-todo-keyword-faces
-                      '(("TODO"   . "#FF0000")
-                        ("FIXME"  . "#FF0000")
-                        ("DEBUG"  . "#A020F0")))
-                :config
-                (global-hl-todo-mode 1))
-
-(defun jd/switch-buffer ()
-  (interactive)
-  (let ((completion-regexp-list '("\\`[^*]"
-                                  "\\`\\([^T]\\|T\\($\\|[^A]\\|A\\($\\|[^G]\\|G\\($\\|[^S]\\|S.\\)\\)\\)\\).*")))
-    (call-interactively 'counsel-switch-buffer)))
+(use-package! hl-todo "emacs-hl-todo"
+  :init
+  (setq hl-todo-keyword-faces
+        '(("TODO"   . "#FF0000")
+          ("FIXME"  . "#FF0000")
+          ("DEBUG"  . "#A020F0")))
+  :config
+  (global-hl-todo-mode 1))
 
 (defvar jd/load-theme-hook nil)
 (defun jd/load-theme ()
@@ -61,41 +55,29 @@
   (counsel-load-theme)
   (run-hooks 'jd/load-theme-hook))
 
-(jd/use-package ivy "emacs-ivy"
-                :diminish
-                :bind
-                (("C-s" . swiper))
-                :config
-                (ivy-mode 1))
-
-(jd/use-package counsel "emacs-counsel"
-                :diminish t
-                :config
-                (counsel-mode 1)
+(use-package! ivy "emacs-ivy"
+  :diminish
+  :bind
+  (("C-s" . swiper))
+  :config
+  (ivy-mode 1))
 
-                (jd/leader-key-def
-                  "t"  '(:ignore t :which-key "Toggle")
-                  "tT" '(toggle-truncate-lines :which-key "Toggle truncate lines")
-                  "tt" '(jd/load-theme  :which-key "Choose theme"))
+(use-package! counsel "emacs-counsel"
+  :diminish t
+  :config
+  (counsel-mode 1))
 
-                (jd/leader-key-def
-                  "bb" '(jd/switch-buffer :which-key "Buffer switch")
-                  "ba" '(counsel-switch-buffer :which-key "Buffer switch")
-                  "b"  '(:ignore t :which-key "Buffer")
-                  "," '(counsel-switch-buffer :which-key "Buffer switch")))
+(use-package! which-key "emacs-which-key"
+  :diminish
+  :config
+  (which-key-mode)
+  (setq which-key-idle-delay 0.3))
 
-(jd/use-package which-key "emacs-which-key"
-                :diminish
-                :config
-                (which-key-mode)
-                (setq which-key-idle-delay 0.3))
+(use-package! all-the-icons "emacs-all-the-icons")
 
-(jd/use-package all-the-icons "emacs-all-the-icons")
-
-
-(jd/use-package beacon "emacs-beacon"
-                :config
-                (beacon-mode 1))
+(use-package! beacon "emacs-beacon"
+  :config
+  (beacon-mode 1))
 
 (setq display-time-string-forms
       '(" " 24-hours ":" minutes " "))
@@ -103,7 +85,7 @@
 (when jd/exwm-p
   (display-battery-mode)
   (display-time-mode))
-                
+
 (provide 'jd-ui)
 
 ;;; jd-ui.el ends here