summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--init.org58
1 files changed, 30 insertions, 28 deletions
diff --git a/init.org b/init.org
index 097cd33..09dce73 100644
--- a/init.org
+++ b/init.org
@@ -144,14 +144,6 @@
#+begin_src emacs-lisp
(setq tramp-mode nil)
#+end_src
-*** Minibuffer
- #+begin_src emacs-lisp
- (use-package jao-minibuffer
- :commands (jao-minibuffer-add-variable
- jao-minibuffer-refresh
- jao-minibuffer-add-mode-line))
- ;; (setq enable-recursive-minibuffers t)
- #+end_src
*** Sleep/awake
#+begin_src emacs-lisp
(use-package jao-sleep)
@@ -247,21 +239,6 @@
(setq echo-keystrokes 1
suggest-key-bindings nil)
#+end_src
-*** Battery
- #+begin_src emacs-lisp
- (use-package battery
- :init (setq battery-load-low 15
- battery-load-critical 8
- battery-mode-line-limit 40
- battery-echo-area-format
- "%L %r %B (%p%% load, remaining time %t)"
- battery-mode-line-format " %b%p "))
- (display-battery-mode 1)
- (setq global-mode-string
- (delq 'battery-mode-line-string global-mode-string))
- (with-eval-after-load "jao-minibuffer"
- (jao-minibuffer-add-variable 'battery-mode-line-string 80))
- #+end_src
* Crypto
*** PGP, EPG, passwords
#+begin_src emacs-lisp
@@ -569,7 +546,21 @@
x-select-enable-primary nil
x-selection-timeout 100)
#+END_SRC
-* Mode line
+* Mode line and minibuffer
+*** Minibuffer
+ #+begin_src emacs-lisp
+ (use-package jao-minibuffer
+ :config
+ (if (jao-colors-scheme-dark-p)
+ (setq jao-minibuffer-active-buffer-line-color "burlywood4"
+ jao-minibuffer-inactive-buffer-line-color "grey25")
+ (setq jao-minibuffer-active-buffer-line-color "burlywood3"))
+ :commands (jao-minibuffer-add-variable
+ jao-minibuffer-refresh
+ jao-minibuffer-add-mode-line))
+ (setq enable-recursive-minibuffers t)
+ (when window-system (jao-minibuffer-add-mode-line 90))
+ #+end_src
*** Time display
#+BEGIN_SRC emacs-lisp
(setq display-time-world-list
@@ -628,10 +619,6 @@
'(" %l" (:eval (format "/%d" (line-number-at-pos (point-max))))))
(line-number-mode -1)
(column-number-mode 1)
- (when (jao-colors-scheme-dark-p)
- (setq jao-minibuffer-active-buffer-line-color "burlywood4"
- jao-minibuffer-inactive-buffer-line-color "grey25"))
- (when window-system (jao-minibuffer-add-mode-line 90))
#+end_src
*** Mode line toggle
#+begin_src emacs-lisp
@@ -669,6 +656,21 @@
(eval-after-load "simple" '(diminish 'auto-fill-function " ยง"))
(eval-after-load "autorevert" '(diminish 'auto-revert-mode "")))
#+END_SRC
+*** Battery
+ #+begin_src emacs-lisp
+ (use-package battery
+ :init (setq battery-load-low 15
+ battery-load-critical 8
+ battery-mode-line-limit 40
+ battery-echo-area-format
+ "%L %r %B (%p%% load, remaining time %t)"
+ battery-mode-line-format " %b%p "))
+ (display-battery-mode 1)
+ (setq global-mode-string
+ (delq 'battery-mode-line-string global-mode-string))
+ (with-eval-after-load "jao-minibuffer"
+ (jao-minibuffer-add-variable 'battery-mode-line-string 80))
+ #+end_src
* Notifications
*** alert
#+BEGIN_SRC emacs-lisp