rename

7 files changed, 38 insertions, 37 deletions

diff --git a/bard-elisp/bard-common.el b/bard-elisp/prot-common.el
index 4482bb4..4482bb4 100644
--- a/bard-elisp/bard-common.el
+++ b/bard-elisp/prot-common.el
diff --git a/bard-emacs-modules/bard-emacs-essentials.el b/bard-emacs-modules/bard-emacs-essentials.el
index 949c457..79d8ea0 100644
--- a/bard-emacs-modules/bard-emacs-essentials.el
+++ b/bard-emacs-modules/bard-emacs-essentials.el
@@ -145,7 +145,7 @@
 (use-package breadcrumb
   :ensure t
   :hook
-  (prog-mode . breadcrumb-mode))
+  (prog-mode . breadcrumb-local-mode))
 
 ;; running emacs as server
 (require 'server)
diff --git a/bard-emacs-modules/bard-emacs-modeline.el b/bard-emacs-modules/bard-emacs-modeline.el
index acce2d6..30f01b1 100644
--- a/bard-emacs-modules/bard-emacs-modeline.el
+++ b/bard-emacs-modules/bard-emacs-modeline.el
@@ -1,3 +1,5 @@
+(require 'bard-modeline)
+
 ;;; Mode line
 (setq mode-line-compact nil) ; Emacs 28
 (setq mode-line-right-align-edge 'right-margin)
@@ -18,8 +20,9 @@
                 prot-modeline-flymake
                 prot-modeline-eglot
                 "  "
-                prot-modeline-misc-info
-                prot-modeline-notmuch-indicator))
+                prot-modeline-notmuch-indicator
+                " "
+                prot-modeline-misc-info))
 
 (with-eval-after-load 'spacious-padding
   (defun prot/modeline-spacious-indicators ()
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el
index cafdd83..c32ae53 100644
--- a/bard-emacs-modules/bard-emacs-org.el
+++ b/bard-emacs-modules/bard-emacs-org.el
@@ -30,6 +30,7 @@
         ("E" . "src emacs-lisp :results value code :lexical t") ; for code examples in notes
         ("t" . "src emacs-lisp :tangle FILENAME") ; tangle without making dir, below makes dir
         ("T" . "src emacs-lisp :tangle FILENAME :mkdirp yes")))
+(setq org-ellipsis "↲")
 
 ;; mainly for denote, org throws away a link that i might reuse later
 (setq org-id-link-to-org-use-id t)
diff --git a/bard-emacs-modules/bard-emacs-ui.el b/bard-emacs-modules/bard-emacs-ui.el
index caffa34..c9905ec 100644
--- a/bard-emacs-modules/bard-emacs-ui.el
+++ b/bard-emacs-modules/bard-emacs-ui.el
@@ -1,22 +1,27 @@
 ;; Generic variables for modes
-(use-package emacs
+(use-package whitespace
+  :ensure nil
+  :demand t
+  :config
+  (setq whitespace-style '(face
+                           tabs
+                           spaces
+                           trailing
+                           space-before-tab
+                           newline indentation
+                           empty space-after-tab
+                           space-mark tab-mark))
+  :hook
+  (prog-mode . whitespace-mode))
+
+(use-package display-line-numbers
+  :ensure nil
+  :demand t
   :bind
   (("<f12>" . display-line-numbers-mode))
+  :hook (prog-mode . display-line-numbers-mode)
   :config
-  (setq display-line-numbers-type 'relative)
-  (setq whitespace-style '(face tabs spaces trailing space-before-tab newline indentation empty space-after-tab space-mark tab-mark)))
-
-;; display line numbers custom mode
-(define-minor-mode bard/display-line-numbers-mode
-  "Toggle `display-line-numbers-mode' and  `hl-line-mode' in tandem"
-  :init-value nil
-  :global nil
-  (if (bard/display-line-numbers-mode
-       (progn
-	 (display-line-numbers-mode 1)
-	 (hl-line-mode 1))
-       (display-line-numbers-mode -1)
-       (hl-line-mode -1))))
+  (setq display-line-numbers-type 'relative))
 
 ;; padding for everything
 (use-package spacious-padding
@@ -36,8 +41,10 @@
 ;; Todo Keywords highlighting, colors defined in bard-emacs-theme.el
 (use-package hl-todo
   :ensure t
-  :init
-  (global-hl-todo-mode t))
+  :hook
+  (prog-mode . hl-todo-mode)
+  :config
+  (setq hl-todo-highlight-punctuation ":"))
 
 (provide 'bard-emacs-ui)
 
diff --git a/bard-emacs-modules/bard-emacs-window.el b/bard-emacs-modules/bard-emacs-window.el
index a358517..8cd6ff4 100644
--- a/bard-emacs-modules/bard-emacs-window.el
+++ b/bard-emacs-modules/bard-emacs-window.el
@@ -14,21 +14,9 @@
   (setq window-min-height 3)
   (setq window-min-width 30))
 
-(use-package eyebrowse
-  :ensure t
-  :config
-  (eyebrowse-mode t)
-  :bind*
-  (("M-0" . eyebrowse-switch-to-window-config-0)
-   ("M-1" . eyebrowse-switch-to-window-config-1)
-   ("M-2" . eyebrowse-switch-to-window-config-2)
-   ("M-3" . eyebrowse-switch-to-window-config-3)
-   ("M-4" . eyebrowse-switch-to-window-config-4)
-   ("M-5" . eyebrowse-switch-to-window-config-5)
-   ("M-6" . eyebrowse-switch-to-window-config-6)
-   ("M-7" . eyebrowse-switch-to-window-config-7)
-   ("M-8" . eyebrowse-switch-to-window-config-8)
-   ("M-9" . eyebrowse-switch-to-window-config-9)))
+;; (use-package beframe
+;;   :ensure t
+;;   )
 
 (use-package windmove
   :bind*
diff --git a/bard-emacs-modules/bard-emacs-writing.el b/bard-emacs-modules/bard-emacs-writing.el
index 8d84c15..377dac6 100644
--- a/bard-emacs-modules/bard-emacs-writing.el
+++ b/bard-emacs-modules/bard-emacs-writing.el
@@ -1,10 +1,12 @@
 ;;; Input related settings
 
 (use-package emacs
-  :ensure t
+  :ensure nil
+  :demand t
   :bind
   (("C-x i" . insert-char)
-   ("M-z"   . zap-to-char))
+   ("M-z"   . zap-to-char)
+   ("<f10>"  . toggle-input-method))
   :config
   ;;; Sentence size
   (setq sentence-end-double-space nil)