4 files changed, 45 insertions, 31 deletions
diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el
index 8075eaf..f654e63 100644
--- a/bard-emacs-modules/bard-emacs-package.el
+++ b/bard-emacs-modules/bard-emacs-package.el
@@ -75,6 +75,31 @@
   :init
   (global-company-mode 1))
 
+(use-package helm
+  :ensure t
+  :init
+  (helm-mode 1)
+  :bind (("M-x" . helm-M-x)
+	 ("C-x C-f" . helm-find-files)
+	 ("C-x b" . helm-mini)
+	 ("M-s" . helm-occur))
+  :config
+  (define-key helm-map (kbd "C-<backspace>") 'backward-kill-word)
+  (define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action) ; rebind tab to do persistent action
+  (define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB works in terminal
+  (define-key helm-map (kbd "C-z")  'helm-select-action))
+
+(use-package helm-rg
+  :ensure t
+  :config
+  (setq helm-rg-default-extra-args '("--hidden" "--smart-case"))
+  (setq helm-rg-prompt "Search for: ")
+  (setq helm-rg-result-file-action
+        (lambda (path)
+          (find-file path)))
+  (setq helm-rg-use-fuzzy-match t)
+  :bind (("C-c s" . 'helm-rg)))
+
 (use-package orderless
   :ensure t)
 
@@ -169,8 +194,8 @@
         '(("TODO"        error bold)
           ("FIXME"       error bold)
           ("WAIT"        warning bold)
-          ("HACK"        font-lock-constant-face bold)
-          ("DEPRECATED"  font-lock-doc-face bold)
+          ("HACK"        completions-common-part bold)
+          ("DEPRECATED"  completions-annotations bold)
 	  ("DONE"        font-lock-doc-face bold)
           ("BUG"         error bold))))
 
@@ -195,3 +220,21 @@
 
 (use-package haskell-mode
   :ensure t)
+
+(use-package flycheck
+  :ensure t
+  :init
+  (global-flycheck-mode t))
+
+(use-package smartparens
+  :ensure t
+  :config
+  (smartparens-global-mode t)
+  (show-smartparens-global-mode t)
+  :bind
+  (("C-<down>" . sp-down-sexp))
+  ("C-<up>"    . sp-up-sexp)
+  ("M-<down>"  . sp-backward-up-sexp)
+  ("M-<up>"    . sp-backward-up-sexp)
+  ("C-M-a"     . sp-beginning-of-sexp)
+  ("C-M-e"     . sp-end-of-sexp))
diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el
index c76786a..aaf728a 100644
--- a/bard-emacs-modules/bard-emacs-ui.el
+++ b/bard-emacs-modules/bard-emacs-ui.el
@@ -43,12 +43,6 @@
 
 (add-to-list 'default-frame-alist '(font . "Iosevka Comfy-14.5"))
 
-;; Common UI hook
-(defun bard/text-hook ()
-  (bard/olivetti-toggle)
-  (display-line-numbers-mode 0)
-  (hl-todo-mode 1))
-
 ;; olivetti
 (use-package olivetti
   :config
diff --git a/bard-emacs-modules/bard-emms.el b/bard-emacs-modules/bard-emms.el
deleted file mode 100644
index a562337..0000000
--- a/bard-emacs-modules/bard-emms.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;; |------------------------------------|
-;; |             EMMS                   |
-;; |------------------------------------|
-
-(require 'emms-setup)
-
-(emms-all)
-(setq emms-player-list '(emms-player-mpv)
-      emms-info-functions '(emms-info-native)
-      emms-playlist-buffer-name "*Music*")
-
-;; Keymaps
-(define-key global-map (kbd "<f8>") #'emms)
-(define-key global-map (kbd "M-<f8>") #'emms-browser)
diff --git a/bard-emacs-modules/bard-lang.el b/bard-emacs-modules/bard-lang.el
deleted file mode 100644
index 2400ea5..0000000
--- a/bard-emacs-modules/bard-lang.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(defun bard/common-modes-hook ()
-  "Commonly used modes, bundled in one hook"
-  (display-line-numbers-mode 1)
-  (electric-pair-mode 1)
-  (hl-todo-mode 1))
-
-(add-hook 'emacs-lisp-mode-hook 'bard/common-modes-hook)
-(add-hook 'haskell-mode-hook 'bard/common-modes-hook)
-(add-hook 'clojure-mode-hook 'bard/common-modes-hook)