More emacs.d updates

4 files changed, 20 insertions, 3 deletions

diff --git a/emacs-prelude/personal/lisp/init-dashboard.el b/emacs-prelude/personal/lisp/init-dashboard.el
index 4bbf04f..538bc4c 100644
--- a/emacs-prelude/personal/lisp/init-dashboard.el
+++ b/emacs-prelude/personal/lisp/init-dashboard.el
@@ -2,6 +2,7 @@
 (use-package dashboard
   :init
   (setq dashboard-center-content t
+        dashboard-startup-banner 'logo
         dashboard-set-footer nil
         dashboard-week-agenda t
         dashboard-projects-backend 'projectile
@@ -15,4 +16,3 @@
   (dashboard-setup-startup-hook))
 
 (provide 'init-dashboard)
-
diff --git a/emacs-prelude/personal/lisp/init-misc.el b/emacs-prelude/personal/lisp/init-misc.el
index e25556d..eb5507a 100644
--- a/emacs-prelude/personal/lisp/init-misc.el
+++ b/emacs-prelude/personal/lisp/init-misc.el
@@ -33,4 +33,14 @@
   :custom
   (dired-kill-when-opening-new-dired-buffer t))
 
+(prelude-require-package 'eshell-z)
+(use-package eshell-z
+  :defer t
+  :hook (eshell-mode . (lambda () (require 'eshell-z))))
+
+(prelude-require-package 'tagedit)
+(use-package tagedit
+  :config (tagedit-add-paredit-like-keybindings)
+  :hook (html-mode . (lambda () (tagedit-mode 1))))
+
 (provide 'init-misc)
diff --git a/emacs-prelude/personal/lisp/init-prelude.el b/emacs-prelude/personal/lisp/init-prelude.el
index fa4895b..436f90b 100644
--- a/emacs-prelude/personal/lisp/init-prelude.el
+++ b/emacs-prelude/personal/lisp/init-prelude.el
@@ -24,10 +24,10 @@
          :weight bold :height 2.5 :box (:line-width 10 :color "red"))))))
 
 (use-package crux
-  ;; allow other things to use C-c s and C-c r
   :init
   (unbind-key "C-c s" prelude-mode-map)
   (unbind-key "C-c r" prelude-mode-map)
+  (unbind-key "C-c o" prelude-mode-map)
   :bind (:map prelude-mode-map
               (("C-c C-s" . crux-swap-windows)
                ("C-c C-r" . crux-rename-file-and-buffer))))
diff --git a/emacs-prelude/personal/lisp/init-ui.el b/emacs-prelude/personal/lisp/init-ui.el
index 344a1c9..ffb3087 100644
--- a/emacs-prelude/personal/lisp/init-ui.el
+++ b/emacs-prelude/personal/lisp/init-ui.el
@@ -39,7 +39,8 @@
   :bind
   ("C-*" . ctrlf-forward-symbol-at-point)
   ("M-s M-s" . ctrlf-toggle-symbol)
-  ("C-M-g" . ctrlf-cancel))
+  ("C-M-g" . ctrlf-cancel)
+  ("C-c o" . ctrlf-occur))
 
 (prelude-require-package 'buffer-move)
 (use-package buffer-move
@@ -53,4 +54,10 @@
   :config
   (global-smartscan-mode t))
 
+(prelude-require-package 'fullframe)
+ (use-package fullframe
+  :after magit
+   :config
+   (fullframe magit-status magit-mode-quit-window))
+
 (provide 'init-ui)