Use built-in battery display

5 files changed, 20 insertions, 13 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index e29e63b..4b7c413 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -39,10 +39,11 @@
 	kill-ring-max 1000
 	undo-limit 320000
 
-        sentence-end-double-space nil
+	sentence-end-double-space nil
         next-line-add-newlines t
         scroll-up-aggressively '0.50
         scroll-down-aggressively '0.50
+	scroll-step 1
 
 	use-short-answers t
         vc-follow-symlinks t
diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index 791277a..eb9edd7 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -95,10 +95,9 @@ that buffer."
   (setq new-mode-line
         (replace-regexp-in-string
          "%" "%%"
-         (format " %s  %s  %s"
+         (format "[%s] [%s]"
                  (shell-command-to-string "/home/bdunahu/.local/bin/mail-string 2>/dev/null")
-                 (shell-command-to-string "/home/bdunahu/.local/bin/power-string 2>/dev/null")
-                 (shell-command-to-string "/home/bdunahu/.local/bin/t1-string 2>/dev/null")))))
+		 (shell-command-to-string "/home/bdunahu/.local/bin/t1-string 2>/dev/null")))))
 
 (defvar-local bd/external-mode-line
     '(:eval (when new-mode-line
diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 382944e..15b470f 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -21,11 +21,11 @@
 
 (defface bd/underline-shadow
   `((t :inherit shadow
-       :underline t))
+       :bold t))
   "Shadow with an underline.")
 
 (defvar-local bd/buffer-identification-mode-line
-    '(:eval (format "%s " (propertize (buffer-name) 'face 'bd/underline-shadow)))
+    '(:eval (format "%s" (propertize (buffer-name) 'face 'bd/underline-shadow)))
   "Formats the modeline-buffer-name.")
 
 ;;;; pos
@@ -42,16 +42,14 @@
   (mapconcat 'concat (cdr (split-string vc-mode "[:-]")) "-"))
 
 (defvar-local bd/vc-mode-line
-    '(:eval (when (and vc-mode (not (eq major-mode 'magit-status-mode))) ; fix to avoid bug which occurs in magit buffer (don't remember)
+    '(:eval (when (and vc-mode (not (eq major-mode 'magit-status-mode)))
               (format " %s "
                       (propertize (git-vc-modeline) 'face 'shadow))))
   "Formats the checked out git repository.")
 
 
-(dolist (construct '(bd/time-mode-line
-                     bd/buffer-identification-mode-line
-                     bd/vc-mode-line
-                     bd/line-position))
+(dolist (construct '(bd/buffer-identification-mode-line
+                     bd/vc-mode-line))
   (put construct 'risky-local-variable t))
 
 
@@ -59,9 +57,11 @@
               (list
                mode-line-front-space
                bd/buffer-identification-mode-line
+	       " -- "
                mode-line-modes
-	       mode-line-modified
-               bd/vc-mode-line
+	       " -- "
+	       bd/vc-mode-line
+	       " -- "
                bd/line-position))
 
 
diff --git a/.config/emacs/modules/bd--tabs.el b/.config/emacs/modules/bd--tabs.el
index 5ee4007..9553888 100644
--- a/.config/emacs/modules/bd--tabs.el
+++ b/.config/emacs/modules/bd--tabs.el
@@ -10,6 +10,12 @@
   (display-time-format "  %m/%d %H:%M")
   (display-time-default-load-average nil))
 
+(use-package battery
+  :init
+  (display-battery-mode)
+  :custom
+  (battery-update-interval 90))
+
 (use-package tab-bar
   :bind (("H-f" . tab-bar-history-forward)
          ("H-b" . tab-bar-history-back))
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index c2a090f..514df4b 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -48,6 +48,7 @@ to.")
   (modus-themes-org-blocks 'grayscale)
   (modus-themes-markup '(background intense))
   (modus-themes-region '(bg-only))
+  (modus-themes-syntax 'alt-syntax)
   (modus-themes-headings
    '((0 rainbow variable-pitch bold 1.5)
      (1 rainbow variable-pitch bold 1.4)