Stable v1

2026-04-11 16:38:46 +10:00
parent 4a779a480c
commit 39346aca6a
9 changed files with 70 additions and 46 deletions
--- a/early-init.el
+++ b/early-init.el
@@ -42,7 +42,7 @@
      inhibit-startup-screen t
      inhibit-startup-echo-area-message user-login-name
      inhibit-default-init t
-      ;; initial-major-mode 'l-mode
+      initial-major-mode 'text-mode
      initial-scratch-message nil)

 ;; Faster to disable these here (before they've been initialized)
--- a/init.el
+++ b/init.el
@@ -30,7 +30,7 @@

 (require 'init-bindings)
 (require 'init-dired)
-;; (require 'init-dashboard) ;; not working
+;; (require 'init-dashboard)
 (require 'init-window)
 (require 'init-shell)
 ;; (require 'init-treemacs) ;; not working
--- a/lisp/init-check.el
+++ b/lisp/init-check.el
@@ -1,6 +1,7 @@
 ;; -*- lexical-binding: t; -*-

 (use-package flycheck
+  :diminish
  :hook (emacs-startup . global-flycheck-mode)
  :config
  (setq flycheck-emacs-lisp-load-path 'inherit)
--- a/lisp/init-dashboard.el
+++ b/lisp/init-dashboard.el
@@ -1,41 +1,49 @@
 ;; -*- lexical-binding: t; -*-

-(use-package dashboard
-  :init
-  (use-package doom-dashboard
-    :ensure (doom-dashboard :host github
-                            :repo "emacs-dashboard/doom-dashboard")
-    :demand t
-    ;; Movement keys like doom.
-    :bind
-    (:map dashboard-mode-map
-          ("<remap> <dashboard-previous-line>" . widget-backward)
-          ("<remap> <dashboard-next-line>" . widget-forward)
-          ("<remap> <previous-line>" . widget-backward)
-          ("<remap> <next-line>"  . widget-forward)
-          ("<remap> <right-char>" . widget-forward)
-          ("<remap> <left-char>"  . widget-backward))
-    :custom
-    (dashboard-banner-logo-title "E M A C S")
-    (dashboard-startup-banner
-     (concat doom-dashboard-banner-directory "bcc.txt")) ; Use banner you want
-    (dashboard-footer-icon
-     (nerd-icons-faicon "nf-fa-github_alt" :face 'success :height 1.5))
-    (dashboard-page-separator "\n")
-    (dashboard-startupify-list `(dashboard-insert-banner
-                                 dashboard-insert-banner-title
-                                 dashboard-insert-newline
-                                 dashboard-insert-items
-                                 ,(dashboard-insert-newline 2)
-                                 dashboard-insert-init-info
-                                 ,(dashboard-insert-newline 2)
-                                 doom-dashboard-insert-homepage-footer))
-    (dashboard-item-generators
-     '((recents   . doom-dashboard-insert-recents-shortmenu)
-       (bookmarks . doom-dashboard-insert-bookmark-shortmenu)
-       (projects  . doom-dashboard-insert-project-shortmenu)
-       (agenda    . doom-dashboard-insert-org-agenda-shortmenu)))
-    (dashboard-items '(projects agenda bookmarks recents)))
-  )
+(use-package dashboard :demand t)  
+
+(use-package doom-dashboard
+  ;; For Straight Users
+  :ensure (doom-dashboard :host github
+                          :repo "emacs-dashboard/doom-dashboard")
+  ;; Or for built-in package-vc
+  ;; :vc (:url "https://github.com/emacs-dashboard/doom-dashboard.git" :rev :newest)
+  ;; :after dashboard
+  :demand t
+  ;; :hook (elpaca-after-init . dashboard-setup-startup-hook)
+  ;; Movement keys like doom.
+  :bind
+  (:map dashboard-mode-map
+        ("<remap> <dashboard-previous-line>" . widget-backward)
+        ("<remap> <dashboard-next-line>" . widget-forward)
+        ("<remap> <previous-line>" . widget-backward)
+        ("<remap> <next-line>"  . widget-forward)
+        ("<remap> <right-char>" . widget-forward)
+        ("<remap> <left-char>"  . widget-backward))
+  :custom
+  (dashboard-banner-logo-title "E M A C S")
+  ;; (dashboard-startup-banner 
+  ;; (concat doom-dashboard-banner-directory "bcc.txt")) ; Use banner you want
+  ;; (dashboard-footer-icon 
+  ;; (nerd-icons-faicon "nf-fa-github_alt" :face 'success :height 1.5))
+  (dashboard-page-separator "\n")
+  (dashboard-startupify-list `(dashboard-insert-banner
+                               dashboard-insert-banner-title
+                               dashboard-insert-newline
+                               dashboard-insert-items
+                               ,(dashboard-insert-newline 2)
+                               dashboard-insert-init-info
+                               ,(dashboard-insert-newline 2)
+                               doom-dashboard-insert-homepage-footer))
+  (dashboard-item-generators
+   '((recents   . doom-dashboard-insert-recents-shortmenu)
+     (bookmarks . doom-dashboard-insert-bookmark-shortmenu)
+     (projects  . doom-dashboard-insert-project-shortmenu)
+     (agenda    . doom-dashboard-insert-org-agenda-shortmenu)))
+  ;; (dashboard-items '(projects agenda bookmarks recents)))
+  (dashboard-items '(projects bookmarks recents)))
+
+;; Why doom 
+

 (provide 'init-dashboard)
--- a/lisp/init-edit.el
+++ b/lisp/init-edit.el
@@ -20,9 +20,20 @@
  :custom
  (puni-confirm-when-delete-unbalanced-active-region nil)
  :bind (:map puni-mode-map
+              ("M-r" . puni-raise)
              ("M-s" . puni-splice)
+              ("M-S" . puni-split)
              ("DEL" . my-backspace)
              ("C-=" . puni-expand-region)
+              ("M-[" . puni-slurp-backward)
+              ("M-]" . puni-slurp-forward)
+              ("M-<left>" . puni-slurp-backward)
+              ("M-<right>" . puni-slurp-forward)
+              ("C-M-[" . puni-barf-backward)
+              ("C-M-]" . puni-barf-forward)
+              ("C-M-<left>" . puni-barf-backward)
+              ("C-M-<right>" . puni-barf-forward)
+              ([remap backward-kill-word] . puni-backward-kill-word)
              )
  :init
  (defun my-backspace ()
--- a/lisp/init-lsp.el
+++ b/lisp/init-lsp.el
@@ -1,9 +1,5 @@
 ;; -*- lexical-binding: t; -*-

-;; LSP booster
-
-
-
 (use-package lsp-mode
  :diminish
  :defines (lsp-diagnostics-disabled-modes lsp-clients-python-library-directories)
--- a/lisp/init-snippet.el
+++ b/lisp/init-snippet.el
@@ -17,8 +17,8 @@
             yas-maybe-expand-abbrev-key-filter)
  :init
  (defvar yas-verbosity 2)
-  :config
-  (elemacs-load-packages-incrementally '(eldoc easymenu help-mode))
+  ;; :config
+  ;; (elemacs-load-packages-incrementally '(eldoc easymenu help-mode))
  (use-package warnings
    :ensure nil
    :config
--- a/lisp/init-ui.el
+++ b/lisp/init-ui.el
@@ -61,6 +61,7 @@

 (use-package auto-dark
  :when (and (eq system-type 'darwin) (display-graphic-p))
+  :diminish
  :ensure t
  ;; :custom
  ;; (auto-dark-themes '((doric-beach) (leuven)))
@@ -83,11 +84,13 @@


 (use-package rainbow-delimiters
+  :diminish
  :hook ((prog-mode . rainbow-delimiters-mode)
         (typst-ts-mode . rainbow-delimiters-mode)
         (python-ts-mode . rainbow-delimiters-mode)))

 (use-package rainbow-mode
+  :diminish
  :hook text-mode
  :hook prog-mode)

@@ -99,15 +102,19 @@
  :hook (elpaca-after-init . doom-modeline-mode)
  :config
  (setq doom-modeline-support-imenu t
-        doom-modeline-icons nil
+        ;; doom-modeline-icons nil
        doom-modeline-height 30
        doom-modeline-buffer-file-name-style 'relative-from-project
        doom-modeline-enable-word-count t
        ;; doom-modeline-project-name t
        doom-modeline-check 'simple
+        doom-modeline-minor-modes t
        doom-modeline-buffer-encoding nil
        doom-modeline-major-mode-icon nil))

+(use-package minions
+  :hook elpaca-after-init)
+
 (use-package hide-mode-line
  :autoload turn-off-hide-mode-line-mode
  :hook (((eat-mode
--- a/lisp/init-writing.el
+++ b/lisp/init-writing.el
@@ -12,6 +12,7 @@
              ))

 (use-package jinx
+  ;; :diminish
  :hook ((text-mode prog-mode conf-mode org-mode) . jinx-mode)
  :commands jinx-mode
  :bind ([remap ispell-word] . jinx-correct))