Merge branch 'main' into single-monitor

emacs.d/init.el

@@ -40,11 +40,11 @@
 ;; No annoying Windows errors
 (set-default-coding-systems 'utf-8)
 
-;; Improved scrolling
+;; Improve scrolling
-(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time
+(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ; one line at a time
-(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling
+(setq mouse-wheel-progressive-speed nil)            ; don't accelerate scrolling
-(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse
+(setq mouse-wheel-follow-mouse 't)                  ; scroll window under mouse
-(setq scroll-step 1) ;; keyboard scroll one line at a time
+(setq scroll-step 1)                                ; keyboard scroll one line at a time
 
 ;; Tabs
 (setq-default indent-tabs-mode nil)
@@ -66,7 +66,6 @@
 (dolist (mode '(org-mode-hook))
   (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
-
 ;; Install and load straight.el
 (defvar bootstrap-version)
 (let ((bootstrap-file
@@ -81,7 +80,6 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
-
 ;;;;;;;;;;;;;; Not needed when using straight.el ;;;;;;;;;;;;;;
 ;; Initialize package sources
 ;(require 'package)
@@ -119,15 +117,14 @@
 (use-package everforest-hard-dark-theme
   :straight (everforest-hard-dark-theme :type git :repo "https://git.sr.ht/~theorytoe/everforest-hard-dark-theme")
   :config
-  (load-theme 'everforest-hard-dark))
+  (load-theme 'everforest-hard-dark t))
 
 ;; (use-package base16-theme
 ;;   :config
 ;;   (load-theme 'gruvbox-dark-soft t))
 
-;; Help distinguish between work from others like sidebars and terminal
+;; Help distinguish work buffers from others like sidebars and terminal
 (use-package solaire-mode
-  :diminish
   :init
   (solaire-global-mode t))
 
@@ -164,7 +161,6 @@
 
 ;; Automatically clean whitespace
 (use-package ws-butler
-  :diminish
   :hook ((text-mode . ws-butler-mode)
          (prog-mode . ws-butler-mode)))
 
@@ -201,7 +197,6 @@
   :bind (("C-s" . swiper)))
 
 (use-package treemacs
-  :defer t
   :bind
   (:map global-map
         ("M-0"       . treemacs-select-window)
@@ -212,7 +207,6 @@
         ("C-x t M-t" . treemacs-find-tag)))
 
 (use-package lsp-treemacs
-  :defer t
   :config
   (lsp-treemacs-sync-mode 1))
 
@@ -314,8 +308,8 @@
 
 ;; C/C++
 
-(setq-default c-default-style "k&r")
+;(setq-default c-default-style "k&r")
-(setq-default c-basic-offset 2)
+;(setq-default c-basic-offset 2)
 
 ;(use-package ccls
 ;  :hook ((c-mode c++-mode objc-mode cuda-mode) .
@@ -360,7 +354,7 @@
   :init
   (setq httpd-port 8123)
   :hook
-  (('js2-mode-hook 'skewer-mode)
+  (('js-mode-hook 'skewer-mode)
    ('css-mode-hook 'skewer-css-mode)
    ('html-mode-hook 'skewer-html-mode)))
 
@@ -401,6 +395,7 @@
                           (lsp))))  ; or lsp-deferred
 
 (use-package numpydoc
+  :after python  
   :bind (:map python-mode-map
               ("C-c C-n" . numpydoc-generate))
   :config