Mixed emacs config updates

3 files changed, 39 insertions, 17 deletions

diff --git a/gui/conf/email.el b/gui/conf/email.el
index 93aee5c..f7e851a 100644
--- a/gui/conf/email.el
+++ b/gui/conf/email.el
@@ -14,7 +14,8 @@
   (setq mu4e-completing-read-function 'ivy-completing-read)
   (require 'org-mu4e)
   (evil-collection-init 'mu4e)
-  (setq doom-modeline-mu4e t))
+  (setq doom-modeline-mu4e t)
+  (setq doom-modeline-gnus nil))
 
 (use-package mu4e-alert
   :ensure t
diff --git a/gui/conf/init.el b/gui/conf/init.el
index dcc8ac6..31d1ab7 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -88,7 +88,7 @@
 (use-package minions
   :ensure t
   :config
-  (minions-mode 1))
+  (minions-mode))
 
 (use-package doom-modeline
   :ensure t
@@ -127,9 +127,6 @@
 
 (setq browse-url-browser-function 'eww-browse-url)
 
-(use-package nix-mode
-  :ensure t)
-
 (use-package direnv
   :ensure t
   :config
@@ -258,8 +255,13 @@
         '((t . ivy--regex-plus)))
   (ivy-mode 1))
 
-(use-package swiper :ensure t)
-(use-package counsel :ensure t)
+(use-package counsel
+  :ensure t)
+
+(use-package helm
+  :ensure t
+  :config
+  (global-set-key (kbd "M-x") 'helm-M-x))
 
 (defun go-to-deft ()
   (interactive)
@@ -270,13 +272,12 @@
   "J" 'evil-forward-paragraph
   "K" 'evil-backward-paragraph
 
-  "P" 'counsel-yank-pop
+  "P" 'helm-show-kill-ring
 
-  (kbd "C-b")     'ivy-switch-buffer
+  (kbd "C-b")     'helm-mini
 
-  (kbd "C-f")     'counsel-find-file
-  (kbd "C-r")     'counsel-recentf
-  (kbd "C-p")     'counsel-git
+  (kbd "C-p")     'projectile-find-file
+  (kbd "M-p")     'projectile-switch-project
   (kbd "C-t")     'counsel-etags-list-tag
 
   (kbd "C-n")     'go-to-deft)
@@ -317,7 +318,6 @@
 (use-package helm-org-rifle
   :ensure t
   :config
-  (evil-collection-init 'helm)
   (evil-define-key 'normal 'global
     (kbd "C-o")  'helm-org-rifle-org-directory
     (kbd "M-o")  'helm-org-rifle-current-buffer))
@@ -339,7 +339,7 @@
   (evil-leader/set-key
     "d" 'counsel-etags-find-tag-at-point))
 
-(use-package ag
+(use-package helm-ag
   :ensure t)
 
 (add-hook 'c-mode-common-hook 'hs-minor-mode t)
@@ -349,9 +349,8 @@
   :ensure t
   :config
   (setq projectile-completion-system 'ivy)
-  (setq projectile-project-search-path '("~/projects/dev"
-																				 "~/projects/contrib"
-																				 "~/projects/playground")))
+  (setq projectile-project-search-path '("~/projects"))
+  (projectile-mode))
 
 (defun get-related-files ()
   (let ((common-basename-files (seq-filter (lambda (file) (string= (file-name-sans-extension file) (file-name-base)))
@@ -372,6 +371,12 @@
   (kbd "<tab>") 'jump-to-first-related
   (kbd "M-r")   'jump-to-related)
 
+(use-package nix-mode
+  :ensure t)
+
+(use-package glsl-mode
+  :ensure t)
+
 (add-hook 'eshell-mode-hook
   (lambda () 
     (define-key eshell-mode-map (kbd "<tab>")
diff --git a/gui/conf/metakr.org b/gui/conf/metakr.org
index cf1df2c..33e2f58 100644
--- a/gui/conf/metakr.org
+++ b/gui/conf/metakr.org
@@ -86,6 +86,10 @@ For quick iteration all colors are stored in a table.
 | org-sched-prev          | #8C3346 |
 | org-agenda-done         | #909636 |
 | eshell-prompt           | #AADB0F |
+| helm-header-fg          | #909636 |
+| helm-header-bg          | #161616 |
+| helm-source-header-fg   | #161616 |
+| helm-source-header-bg   | #909636 |
 
 * Structure
 #+NAME: structure
@@ -336,6 +340,18 @@ For quick iteration all colors are stored in a table.
 ;; Eshell
   (eshell-prompt
    :foreground @eshell-prompt)
+
+;; Helm
+  (helm-header
+   :inherit fixed-pitch
+   :foreground @helm-header-fg
+   :background @helm-header-bg)
+  (helm-source-header
+   :inherit fixed-pitch
+   :foreground @helm-source-header-fg
+   :background @helm-source-header-bg)
+  (helm-selection
+   :background @bg-hlt)
 )
 #+END_SRC