summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doom/.config/doom/config.el18
-rw-r--r--doom/.config/doom/config.org44
-rw-r--r--doom/.config/doom/packages.el3
-rw-r--r--tmp.txt1
4 files changed, 44 insertions, 22 deletions
diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index a3636e5..d8a7bad 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -5,8 +5,8 @@
(splash-screen)
(get-buffer "*splash*"))
-(setq doom-fallback-buffer-name "*splash*"
- initial-buffer-choice #'+splash-initial-buffer)
+(setq doom-fallback-buffer-name "*splash*" ; make the splash screen be un-killable
+ initial-buffer-choice #'+splash-initial-buffer) ; appear on emacs startup
(defadvice! +splash-regenerate-if-missing-a (&rest _)
:before #'doom-fallback-buffer
@@ -24,11 +24,15 @@
(setq display-line-numbers-type t)
-(use-package! mood-line
-:config
-(mood-line-mode)
-:custom
-(mood-line-glyph-alist mood-line-glyphs-fira-code))
+;; (use-package! mood-line
+;; :config
+;; (mood-line-mode)
+;; :custom
+;; (mood-line-glyph-alist mood-line-glyphs-fira-code))
+
+(use-package! minions
+ :config
+ (minions-mode 1))
(defun my/split-window-dynamically ()
"Split the selected window, choosing orientation by its shape."
diff --git a/doom/.config/doom/config.org b/doom/.config/doom/config.org
index ababf22..1216415 100644
--- a/doom/.config/doom/config.org
+++ b/doom/.config/doom/config.org
@@ -5,16 +5,20 @@ For us, this line of code is... (drumroll please)
#+begin_src emacs-lisp
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
#+end_src
-* Splash screen
-This is my custom splash screen for Emacs.
+
+Yea i need to work on the foreword don't i
+* TODO Splash screen
+
+Here we load a custom splash screen.
+I still have to put the splash screen source in this org file, but that'll come later
#+begin_src emacs-lisp
(load! "splash")
(defun +splash-initial-buffer ()
(splash-screen)
(get-buffer "*splash*"))
-(setq doom-fallback-buffer-name "*splash*"
- initial-buffer-choice #'+splash-initial-buffer)
+(setq doom-fallback-buffer-name "*splash*" ; make the splash screen be un-killable
+ initial-buffer-choice #'+splash-initial-buffer) ; appear on emacs startup
(defadvice! +splash-regenerate-if-missing-a (&rest _)
:before #'doom-fallback-buffer
@@ -58,13 +62,26 @@ I dont like rln, i just dont
mood-line is a nice & simple modeline for emacs!
#+begin_src emacs-lisp
- (use-package! mood-line
- :config
- (mood-line-mode)
- :custom
- (mood-line-glyph-alist mood-line-glyphs-fira-code))
+ ;; (use-package! mood-line
+ ;; :config
+ ;; (mood-line-mode)
+ ;; :custom
+ ;; (mood-line-glyph-alist mood-line-glyphs-fira-code))
+#+end_src
+The above is commented if the below is in action.
+I might try out the default Emacs modeline for a bit sometime, or maybe spacemacs' ~spaceline~
+
+The default Emacs modeline, by default, spills out EVERY minor & major mode into the modeline.
+That's kind of yucky, so the ~minions~ package fixes it by hiding most of them & having a menu for which to show.
+
+Now, let's configure it!
+#+begin_src emacs-lisp
+ (use-package! minions
+ :config
+ (minions-mode 1))
#+end_src
+...Yea that's 'bout it.
** Custom window management
I didnt like how in emacs, split windows under ~SPC w s~ just stack, so i made this function to make it dynamic in a fibonnaci-like layout.
#+begin_src emacs-lisp
@@ -103,8 +120,8 @@ this is because we are in the UI section of the file.
** Zen
the ~zen~ option in Doom Emacs enables ~writeroom~ mode on toggle.
-~writeroom~ centers the buffer, makes it bigger and lets you type away without distractions.
-By default, entering ~writeroom~ mode (which i will continue to call ~zen~ mode) changes the typeface in the buffer.
+~writeroom~ centers the buffer, makes it bigger and lets you type away without distractions, or read via ~nov.el~ easier.
+By default, entering ~writeroom~ mode changes the typeface in the buffer.
I don't like that, especially when im editing source blocks (e.g here). Let's turn it off.
#+begin_src emacs-lisp
(setq +zen-mixed-pitch-modes '())
@@ -133,6 +150,7 @@ Hook the function up up to f5
** Eglot
Eglot is, well, LSP for Emacs!
+It bundles all your LSP's into one big package so you dont have to install everything manually
Here i hook eglot-ensure into prog-mode.
eglot-ensure makes sure that eglot is enabled and working when opening a prog-mode buffer now.
#+begin_src emacs-lisp
@@ -535,7 +553,9 @@ This currently doesnt work.
#+end_src
* vc
-~LEAVE Emacs? You gotta be kidding.~
+#+begin_quote
+Now you don't even need a terminal to do your version control!
+#+end_quote
** TODO vc :: maps
Mappings for vc.
By default, vc bindings are under ~C-x v~, but thats annoying, i'll be binding it under ~SPC v~
diff --git a/doom/.config/doom/packages.el b/doom/.config/doom/packages.el
index 171b61f..f04f49d 100644
--- a/doom/.config/doom/packages.el
+++ b/doom/.config/doom/packages.el
@@ -4,8 +4,6 @@
(package! try)
(package! modus-themes)
(package! ef-themes)
-(package! majutsu
- :recipe (:host github :repo "0WD0/majutsu"))
(unpin! org-roam)
(package! org-roam-ui)
(package! breadcrumb)
@@ -20,3 +18,4 @@
(package! eglot-booster
:recipe (:host github :repo "jdtsmith/eglot-booster"))
(package! vc-jj)
+(package! minions)
diff --git a/tmp.txt b/tmp.txt
deleted file mode 100644
index c46a168..0000000
--- a/tmp.txt
+++ /dev/null
@@ -1 +0,0 @@
-hii!!