Miscellaneous code-cleanup

5 files changed, 17 insertions, 25 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 4b08552..dfc5a1c 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -16,34 +16,34 @@
         backup-directory-alist `(("." . ,(expand-file-name "tmp/backups/" user-emacs-directory))))
 (make-directory (expand-file-name "tmp/auto_saves/" user-emacs-directory) t)
 
-;;;; path
 (setenv "PATH" (format "%s:%s" (expand-file-name "~/.local/bin/") (getenv "PATH")))
 
-;;;; warnings
-(setopt warning-minimum-level :error)
-
-
-;;;; basic
 (keymap-global-unset "C-z")
 (keymap-global-unset "C-x C-z")
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-z =") 'text-scale-increase)
 (global-set-key (kbd "C-z -") 'text-scale-decrease)
 
-(setopt inhibit-startup-message t
+(setopt warning-minimum-level :error
+
+	inhibit-startup-message t
         initial-major-mode 'eshell-mode
-        initial-scratch-message nil)
-(setopt text-scale-mode-step 1.1)
-(setopt kill-whole-line t
+        initial-scratch-message nil
+
+	text-scale-mode-step 1.1
+
+	kill-whole-line t
         sentence-end-double-space nil
         next-line-add-newlines t
         scroll-up-aggressively '0.50
-        scroll-down-aggressively '0.50)
-(setopt use-short-answers t
+        scroll-down-aggressively '0.50
+
+	use-short-answers t
         vc-follow-symlinks t
         completion-ignore-case t
         read-buffer-completion-ignore-case t)
 (setq-default tab-width 8)
+(indent-tabs-mode 0)
 (fringe-mode '(0 . 0))
 (global-hl-line-mode 1)
 (global-visual-line-mode t)
@@ -54,7 +54,6 @@
 (tooltip-mode -1)
 
 
-;;;; gnus
 (keymap-global-set "C-c m" #'gnus)
 (setopt readmail-command 'gnus
         mail-user-agent 'gnus-user-agent
@@ -68,17 +67,13 @@
         gnus-read-newsrc-file nil)
 
 
-;;;; configure packages
-;; external package manager
+;; packages installed via guix
 (setopt package-archives nil
         package-enable-at-startup t)
-;; path to guix-provided packages
 (add-to-list 'load-path (expand-file-name "~/.guix-home/profile/share/emacs/site-lisp"))
 (guix-emacs-autoload-packages)
-;; use-package
-(require 'use-package-ensure)
-;; (setq use-package-verbose t)
 
+(require 'use-package-ensure)
 
 ;;;; add my modules to load path
 (mapc
@@ -88,7 +83,7 @@
 
 
 ;;;; load modules
-(require 'bd--secret) ;; (contains bookmarks/email vars---git ignored)
+(require 'bd--secret) ;; contains bookmarks/email vars---git ignored
 (require 'bd--browse)
 (require 'bd--rss)
 (require 'bd--gpg)
diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 76c8a6c..9538b57 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -18,8 +18,6 @@ to.")
    (add-hook hook #'display-line-numbers-mode))
  bd/enable-line-numbers-in-hooks)
 
-(indent-tabs-mode 0)
-
 ;; skr (skribe) is a scheme extension
 (add-to-list 'auto-mode-alist '("\\.skr\\'" . scheme-mode))
 
diff --git a/.config/emacs/modules/bd--exwm-windowing.el b/.config/emacs/modules/bd--exwm-windowing.el
index cfacf28..791277a 100644
--- a/.config/emacs/modules/bd--exwm-windowing.el
+++ b/.config/emacs/modules/bd--exwm-windowing.el
@@ -51,8 +51,7 @@ that buffer."
                   (interactive)
                   (other-window -1)))
      ([?\s-L] . desktop-environment-lock-screen)
-     ([f2] . desktop-environment-brightness-decrement)
-     ([f3] . desktop-environment-toggle-mute)
+     ([f2] . desktop-environment-toggle-mute)
      ([f5] . desktop-environment-volume-decrement)
      ([f6] . desktop-environment-volume-increment)
      ([f8] . desktop-environment-brightness-decrement)
diff --git a/.config/emacs/modules/bd--irc.el b/.config/emacs/modules/bd--irc.el
index 6c97cc1..17f1f4e 100644
--- a/.config/emacs/modules/bd--irc.el
+++ b/.config/emacs/modules/bd--irc.el
@@ -21,6 +21,7 @@
       :port 6697
       :encryption tls)))
   ;; for tab-bar
+  :config
   (defvar-local bd/irc-status
       '(:eval
         rcirc-activity-string))
diff --git a/.config/emacs/modules/bd--modeline.el b/.config/emacs/modules/bd--modeline.el
index 0602b19..0b142d6 100644
--- a/.config/emacs/modules/bd--modeline.el
+++ b/.config/emacs/modules/bd--modeline.el
@@ -1,6 +1,5 @@
 ;;; -*- lexical-binding: t; -*-
 ;;; Commentary:
-;;; probably load this last
 ;;; Code: