sync

3 files changed, 95 insertions, 62 deletions

diff --git a/config.el b/config.el
index 6a51219..1c3dab3 100644
--- a/config.el
+++ b/config.el
@@ -2049,32 +2049,47 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 ;;   (set-face-attribute 'mode-line-inactive nil :height 180))
 
 (display-time-mode 1)
-(use-package lambda-line
-  :straight (:type git :host github :repo "lambda-emacs/lambda-line") 
-  :custom
-  (lambda-line-lsp-indicator nil)
-  (lambda-line-icon-time t) ;; requires ClockFace font (see below)
-  (lambda-line-clockface-update-fontset "ClockFaceRect") ;; set clock icon
-  (lambda-line-position 'top) ;; Set position of status-line 
-  (lambda-line-abbrev nil) ;; abbreviate major modes
-  (lambda-line-hspace "  ")  ;; add some cushion
-  (lambda-line-prefix t) ;; use a prefix symbol
-  (lambda-line-prefix-padding nil) ;; no extra space for prefix 
-  (lambda-line-status-invert nil)  ;; no invert colors
-  (lambda-line-gui-ro-symbol  " ⨂") ;; symbols
-  (lambda-line-gui-mod-symbol " ⬤") 
-  (lambda-line-gui-rw-symbol  " ◯") 
-  (lambda-line-vc-symbol nil)
-  (lambda-line-space-top -.50)  ;; padding on top and bottom of line
-  (lambda-line-space-bottom -.50)
-  (lambda-line-symbol-position 0.1) ;; adjust the vertical placement of symbol
+;; (use-package lambda-line
+;;   :straight (:type git :host github :repo "lambda-emacs/lambda-line") 
+;;   :custom
+;;   (lambda-line-lsp-indicator nil)
+;;   (lambda-line-icon-time t) ;; requires ClockFace font (see below)
+;;   (lambda-line-clockface-update-fontset "ClockFaceRect") ;; set clock icon
+;;   (lambda-line-position 'top) ;; Set position of status-line 
+;;   (lambda-line-abbrev nil) ;; abbreviate major modes
+;;   (lambda-line-hspace "  ")  ;; add some cushion
+;;   (lambda-line-prefix t) ;; use a prefix symbol
+;;   (lambda-line-prefix-padding nil) ;; no extra space for prefix 
+;;   (lambda-line-status-invert nil)  ;; no invert colors
+;;   (lambda-line-gui-ro-symbol  " ⨂") ;; symbols
+;;   (lambda-line-gui-mod-symbol " ⬤") 
+;;   (lambda-line-gui-rw-symbol  " ◯") 
+;;   (lambda-line-vc-symbol nil)
+;;   (lambda-line-space-top -.50)  ;; padding on top and bottom of line
+;;   (lambda-line-space-bottom -.50)
+;;   (lambda-line-symbol-position 0.1) ;; adjust the vertical placement of symbol
+;;   :config
+;;   ;; activate lambda-line 
+;;   (lambda-line-mode) 
+;;   ;; set divider line in footer
+;;   (when (eq lambda-line-position 'top)
+;;     (setq-default mode-line-format (list "%_"))
+;;     (setq mode-line-format (list "%_"))))
+
+(use-package punch-line
+  :ensure t
+  :straight (:host github :repo "konrad1977/punch-line")
   :config
-  ;; activate lambda-line 
-  (lambda-line-mode) 
-  ;; set divider line in footer
-  (when (eq lambda-line-position 'top)
-    (setq-default mode-line-format (list "%_"))
-    (setq mode-line-format (list "%_"))))
+  (setq punch-line-left-separator "  "
+        punch-line-right-separator "  "
+		punch-show-git-info nil
+		punch-show-buffer-position t
+        punch-line-music-max-length 80
+		punch-line-modal-divider-style 'block
+		punch-line-section-backgrounds 'auto)
+  (punch-line-mode 1)
+  (setq-default header-line-format mode-line-format)
+  (setq-default mode-line-format nil))
 
 (use-package adaptive-wrap
   :ensure t
@@ -2257,7 +2272,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   :straight (:type git :host github :repo "lambda-emacs/lambda-themes") 
   :custom
   (lambda-themes-set-italic-comments t)
-  ;; (lambda-themes-set-italic-keywords t)
+  (lambda-themes-set-italic-keywords t)
   (lambda-themes-set-variable-pitch t) 
   :config
   (load-theme 'lambda-dark-faded))
@@ -2314,10 +2329,10 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   :ensure t
   :after (dired-rsync transient))
 
-;; (setq-default olivetti-body-width 115)
-;; (define-globalized-minor-mode my/global-olivetti-mode olivetti-mode
-;;   (lambda () (olivetti-mode 1)))
-;; (my/centered-cursor)
+(setq-default olivetti-body-width 115)
+(define-globalized-minor-mode my/global-olivetti-mode olivetti-mode
+  (lambda () (olivetti-mode 1)))
+(my/centered-cursor)
 ;; (my/global-olivetti-mode)
 
 (use-package org-modern-indent
diff --git a/config.org b/config.org
index df27f9b..18c793c 100644
--- a/config.org
+++ b/config.org
@@ -2573,32 +2573,50 @@ ily <3.
 
 #+begin_src emacs-lisp
 (display-time-mode 1)
-(use-package lambda-line
-  :straight (:type git :host github :repo "lambda-emacs/lambda-line") 
-  :custom
-  (lambda-line-lsp-indicator nil)
-  (lambda-line-icon-time t) ;; requires ClockFace font (see below)
-  (lambda-line-clockface-update-fontset "ClockFaceRect") ;; set clock icon
-  (lambda-line-position 'top) ;; Set position of status-line 
-  (lambda-line-abbrev nil) ;; abbreviate major modes
-  (lambda-line-hspace "  ")  ;; add some cushion
-  (lambda-line-prefix t) ;; use a prefix symbol
-  (lambda-line-prefix-padding nil) ;; no extra space for prefix 
-  (lambda-line-status-invert nil)  ;; no invert colors
-  (lambda-line-gui-ro-symbol  " ⨂") ;; symbols
-  (lambda-line-gui-mod-symbol " ⬤") 
-  (lambda-line-gui-rw-symbol  " ◯") 
-  (lambda-line-vc-symbol nil)
-  (lambda-line-space-top -.50)  ;; padding on top and bottom of line
-  (lambda-line-space-bottom -.50)
-  (lambda-line-symbol-position 0.1) ;; adjust the vertical placement of symbol
+;; (use-package lambda-line
+;;   :straight (:type git :host github :repo "lambda-emacs/lambda-line") 
+;;   :custom
+;;   (lambda-line-lsp-indicator nil)
+;;   (lambda-line-icon-time t) ;; requires ClockFace font (see below)
+;;   (lambda-line-clockface-update-fontset "ClockFaceRect") ;; set clock icon
+;;   (lambda-line-position 'top) ;; Set position of status-line 
+;;   (lambda-line-abbrev nil) ;; abbreviate major modes
+;;   (lambda-line-hspace "  ")  ;; add some cushion
+;;   (lambda-line-prefix t) ;; use a prefix symbol
+;;   (lambda-line-prefix-padding nil) ;; no extra space for prefix 
+;;   (lambda-line-status-invert nil)  ;; no invert colors
+;;   (lambda-line-gui-ro-symbol  " ⨂") ;; symbols
+;;   (lambda-line-gui-mod-symbol " ⬤") 
+;;   (lambda-line-gui-rw-symbol  " ◯") 
+;;   (lambda-line-vc-symbol nil)
+;;   (lambda-line-space-top -.50)  ;; padding on top and bottom of line
+;;   (lambda-line-space-bottom -.50)
+;;   (lambda-line-symbol-position 0.1) ;; adjust the vertical placement of symbol
+;;   :config
+;;   ;; activate lambda-line 
+;;   (lambda-line-mode) 
+;;   ;; set divider line in footer
+;;   (when (eq lambda-line-position 'top)
+;;     (setq-default mode-line-format (list "%_"))
+;;     (setq mode-line-format (list "%_"))))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package punch-line
+  :ensure t
+  :straight (:host github :repo "konrad1977/punch-line")
   :config
-  ;; activate lambda-line 
-  (lambda-line-mode) 
-  ;; set divider line in footer
-  (when (eq lambda-line-position 'top)
-    (setq-default mode-line-format (list "%_"))
-    (setq mode-line-format (list "%_"))))
+  (setq punch-line-left-separator "  "
+        punch-line-right-separator "  "
+		punch-show-git-info nil
+		punch-show-buffer-position t
+        punch-line-music-max-length 80
+		punch-line-modal-divider-style 'block
+		punch-line-section-backgrounds 'auto)
+  (punch-line-mode 1)
+  (setq-default header-line-format mode-line-format)
+  (setq-default mode-line-format nil))
+
 #+end_src
 
 * soph
@@ -2809,7 +2827,7 @@ ily <3.
   :straight (:type git :host github :repo "lambda-emacs/lambda-themes") 
   :custom
   (lambda-themes-set-italic-comments t)
-  ;; (lambda-themes-set-italic-keywords t)
+  (lambda-themes-set-italic-keywords t)
   (lambda-themes-set-variable-pitch t) 
   :config
   (load-theme 'lambda-dark-faded))
@@ -2890,10 +2908,10 @@ ily <3.
 * my/fns
 
 #+begin_src emacs-lisp
-;; (setq-default olivetti-body-width 115)
-;; (define-globalized-minor-mode my/global-olivetti-mode olivetti-mode
-;;   (lambda () (olivetti-mode 1)))
-;; (my/centered-cursor)
+(setq-default olivetti-body-width 115)
+(define-globalized-minor-mode my/global-olivetti-mode olivetti-mode
+  (lambda () (olivetti-mode 1)))
+(my/centered-cursor)
 ;; (my/global-olivetti-mode)
 #+end_src
 
diff --git a/custom-vars.el b/custom-vars.el
index dbab722..fcc18d7 100644
--- a/custom-vars.el
+++ b/custom-vars.el
@@ -5,10 +5,10 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("5ec088e25ddfcfe37b6ae7712c9cb37fd283ea5df7ac609d007cafa27dab6c64"
+   '("1b623b81f373d49bcf057315fe404b30c500c3b5a387cf86c699d83f2f5763f4"
+	 "5ec088e25ddfcfe37b6ae7712c9cb37fd283ea5df7ac609d007cafa27dab6c64"
 	 "0f220ea77c6355c411508e71225680ecb3e308b4858ef6c8326089d9ea94b86f"
 	 default))
- '(lambda-themes-set-italic-comments t)
  '(lambda-themes-set-italic-keywords nil)
  '(lambda-themes-set-vibrant t)
  '(zoom-size '(0.382 . 0.618)))