From 1f4b58f9db59bba8e1411cbd79947a655c9b612f Mon Sep 17 00:00:00 2001 From: horhik Date: Sat, 11 Mar 2023 14:40:35 +0300 Subject: [PATCH] update emacs config --- home/emacs/.emacs.d/config.org | 273 +++++++++++++++++---------------- home/emacs/.emacs.d/init.el | 79 +++++----- 2 files changed, 182 insertions(+), 170 deletions(-) diff --git a/home/emacs/.emacs.d/config.org b/home/emacs/.emacs.d/config.org index 350effe..710b4da 100644 --- a/home/emacs/.emacs.d/config.org +++ b/home/emacs/.emacs.d/config.org @@ -97,7 +97,7 @@ *** Disbling line numbers #+begin_src emacs-lisp ;(column-number-mode) - (global-display-line-numbers-mode 0) + (global-display-line-numbers-mode 1) (dolist (mode '(org-mode-hook term-mode-hook shell-mode-hook @@ -288,135 +288,147 @@ * Org mode setup ** Basic +* +*** Margin setup #+begin_src emacs-lisp - (defun my/org-mode-setup() - (auto-fill-mode 0) - (visual-line-mode 1) - (setq evil-auto-indent 1) - (variable-pitch-mode t) - (prettify-symbols-mode +1) - (display-line-numbers-mode 0) - ) - - (use-package org - :straight t - - :hook ((org-mode . my/org-mode-setup) - (org-mode . variable-pitch-mode) - (org-mode . org-indent-mode) - (org-mode . prettify-symbols-mode) - ) - :config - (require 'org-habit) - (add-to-list 'org-modules 'org-habit) - (setq org-habit-graph-column 60) - (setq org-treat-insert-todo-heading-as-state-change t) - (setq org-agenda-start-with-log-mode t) - (setq org-log-done 'time) - (setq org-log-into-drawer t) - - - ;; Make sure org-indent face is available - ;; Increase the size of various headings - - - (add-hook 'org-agenda-finalize-hook #'hl-line-mode) - - (set-face-attribute 'org-document-title nil :font "FiraSans" :weight 'bold :height 1.3) - - (dolist (face '((org-level-1 . 1.2) - (org-level-2 . 1.1) - (org-level-3 . 1.0) - (org-level-4 . 1.0) - (org-level-5 . 1.0) - (org-level-6 . 1.0) - (org-level-7 . 1.0) - (org-level-8 . 1.0))) - (set-face-attribute (car face) nil :font "FiraSans" :weight 'bold :height (cdr face))) - - ;; Ensure that anything that should be fixed-pitch in Org files appears that way - (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) - (set-face-attribute 'org-table nil :inherit 'fixed-pitch) - (set-face-attribute 'org-formula nil :inherit 'fixed-pitch) - (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) - ;(set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch)) - (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) - (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) - (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) - (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch) - - (setq org-agenda-files - '( - "~/GTD/daily.org" - "~/GTD/tasks.org" - "~/GTD/inbox.org" - "~/GTD/done.org" - "~/GTD/projects.org" - "~/GTD/backlog.org" - "~/GTD/calendar.org" - "~/GTD/watchlist.org" - "~/GTD/readlist.org" - )) - (setq org-image-actual-width (list 550)) - ;; Get rid of the background on column views - (set-face-attribute 'org-column nil :background nil) - (set-face-attribute 'org-column-title nil :background nil) - (setq org-src-fontify-natively t) - (setq org-agenda-start-with-log-mode t) - (setq org-log-done 'time) - (setq org-log-into-drawer t) - (setq org-todo-keyword-faces '(("TODO" . org-warning) - ("STARTED" . "yellow") - ("DREAM" . "pink") - ("PJ" . "pink") - ("IDEA" . "gold") - ("READ" . "violet") - ("NEXT" . "red") - ("ARTICLE" . "lightblue") - ("CANCELED" . - (:foreground "blue" - :weight bold)))) - - (setq org-todo-keywords '((sequence "INBOX(i)" "PJ(p)" "TODO(t)" "NEXT(n)" "CAL(c)" "WAIT(w@/!)" "|" "DONE(d!)" "CANC(k@)") - (sequence "IDEA(I)" "DREAM(D)" "READ(R)" "|" "DONE(d!)" "CANC(k@)") - )) - (setq org-agenda-custom-commands org-agenda-settings) -(setq org-refile-targets - '((("~/GTD/tasks.org") :maxlevel . 2) - (("~/GTD/projects.org") :maxlevel . 2) - (("~/GTD/backlog.org") :maxlevel . 1) - (("~/GTD/done.org") :maxlevel . 1) - )) - - + (defun my/setup-org-margins() + (setq visual-fill-column-center-text t) + (visual-fill-column-mode t) + (visual-line-mode t) ) +#+end_src +*** Other +#+begin_src emacs-lisp + (defun my/org-mode-setup() + (auto-fill-mode 0) + (visual-line-mode 1) + (setq evil-auto-indent 1) + (variable-pitch-mode t) + (prettify-symbols-mode +1) + (display-line-numbers-mode 0) + ) - (defun org-habit-streak-count () - (point-min) - (while (not (eobp)) - (when (get-text-property (point) 'org-habit-p) - (let ((count (count-matches - (char-to-string org-habit-completed-glyph) - (line-beginning-position) (line-end-position)))) - (end-of-line) - (insert (number-to-string count)))) - (forward-line 1))) - (add-hook 'org-agenda-finalize-hook 'org-habit-streak-count) + (use-package org + :straight t - (use-package org-bullets - :after (org) - :hook ( - (org-mode . org-bullets-mode ) - (org-mode . org-indent-mode ) + :hook ((org-mode . my/org-mode-setup) + (org-mode . variable-pitch-mode) + (org-mode . org-indent-mode) + (org-mode . prettify-symbols-mode) + (org-mode . my/setup-org-margins) + ) + :config + (require 'org-habit) + (add-to-list 'org-modules 'org-habit) + (setq org-habit-graph-column 60) + (setq org-treat-insert-todo-heading-as-state-change t) + (setq org-agenda-start-with-log-mode t) + (setq org-log-done 'time) + (setq org-log-into-drawer t) + (setq org-hide-emphasis-markers t) - ) + ;; Make sure org-indent face is available + ;; Increase the size of various headings + + + (add-hook 'org-agenda-finalize-hook #'hl-line-mode) + + (set-face-attribute 'org-document-title nil :font "mononoki" :weight 'bold :height 1.3) + + ;; (dolist (face '((org-level-1 . 1.0) + ;; (org-level-2 . 1.0) + ;; (org-level-3 . 1.0) + ;; (org-level-4 . 1.0) + ;; (org-level-5 . 1.0) + ;; (org-level-6 . 1.0) + ;; (org-level-7 . 1.0) + ;; (org-level-8 . 1.0))) + ;; (set-face-attribute (car face) nil :font "mononoki" :weight 'bold :height (cdr face))) + + ;; Ensure that anything that should be fixed-pitch in Org files appears that way + ;(set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-table nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-formula nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) + ;(set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch)) + ; (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + ;(set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) + ;(set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) + ; (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch) + + (setq org-agenda-files + '( + "~/GTD/daily.org" + "~/GTD/tasks.org" + "~/GTD/inbox.org" + "~/GTD/done.org" + "~/GTD/projects.org" + "~/GTD/backlog.org" + "~/GTD/calendar.org" + "~/GTD/watchlist.org" + "~/GTD/readlist.org" + )) + (setq org-image-actual-width (list 550)) + ;; Get rid of the background on column views + (set-face-attribute 'org-column nil :background nil) + (set-face-attribute 'org-column-title nil :background nil) + (setq org-src-fontify-natively t) + (setq org-agenda-start-with-log-mode t) + (setq org-log-done 'time) + (setq org-log-into-drawer t) + (setq org-todo-keyword-faces '(("TODO" . org-warning) + ("STARTED" . "yellow") + ("DREAM" . "pink") + ("PJ" . "pink") + ("IDEA" . "gold") + ("READ" . "violet") + ("NEXT" . "red") + ("ARTICLE" . "lightblue") + ("CANCELED" . + (:foreground "blue" + :weight bold)))) + + (setq org-todo-keywords '((sequence "INBOX(i)" "PJ(p)" "TODO(t)" "NEXT(n)" "CAL(c)" "WAIT(w@/!)" "|" "DONE(d!)" "CANC(k@)") + (sequence "IDEA(I)" "DREAM(D)" "READ(R)" "|" "DONE(d!)" "CANC(k@)") + )) + (setq org-agenda-custom-commands org-agenda-settings) + (setq org-refile-targets + '((("~/GTD/tasks.org") :maxlevel . 2) + (("~/GTD/projects.org") :maxlevel . 2) + (("~/GTD/backlog.org") :maxlevel . 1) + (("~/GTD/done.org") :maxlevel . 1) + )) + + + ) + + (defun org-habit-streak-count () + (point-min) + (while (not (eobp)) + (when (get-text-property (point) 'org-habit-p) + (let ((count (count-matches + (char-to-string org-habit-completed-glyph) + (line-beginning-position) (line-end-position)))) + (end-of-line) + (insert (number-to-string count)))) + (forward-line 1))) + (add-hook 'org-agenda-finalize-hook 'org-habit-streak-count) + + (use-package org-bullets + :after (org) + :hook ( + (org-mode . org-bullets-mode ) + (org-mode . org-indent-mode ) + + ) + + ) + (require 'general) + (evil-define-key 'normal org-mode-map (kbd "") #'org-cycle) + (general-def org-mode-map + "TAB" 'org-cycle ) - (require 'general) - (evil-define-key 'normal org-mode-map (kbd "") #'org-cycle) - (general-def org-mode-map - "TAB" 'org-cycle - ) #+end_src ** Org Fonts #+begin_src emacs-lisp @@ -1006,11 +1018,11 @@ https://github.com/emacs-eaf/emacs-application-framework :host github :repo "emacs-eaf/emacs-application-framework" :files ("*.el" "*.py" "core" "app" "*.json") - :includes (eaf-pdf-viewer eaf-browser eaf-music-player eaf-image-viewer eaf-org-previewer eaf-markdown-previewer) ; Straight won't try to search for these packages when we make further use-package invocations for them + :includes ( eaf-browser ) ; Straight won't try to search for these packages when we make further use-package invocations for them - :pre-build (("python" "install-eaf.py" "--install" "pdf-viewer" "browser" "music-player" "image-viewer" "org-previewer" "markdown-previewer" "evil" "--ignore-sys-deps")) + :pre-build (("python" "install-eaf.py" "--install" "pdf-viewer" "browser" "evil" "--ignore-sys-deps")) ) :init (evil-set-initial-state 'eaf-mode 'emacs)) ; Evil mode doesn't work well with eaf keybindings. :config @@ -1021,11 +1033,6 @@ https://github.com/emacs-eaf/emacs-application-framework :custom (eaf-browser-continue-where-left-off t) (eaf-browser-enable-adblocker t)) - (use-package eaf-pdf-viewer) - (use-package eaf-music-player) - (use-package eaf-image-viewer) - (use-package eaf-org-previewer) - (use-package eaf-markdown-previewer) ;(setq spacemacs-cmds) @@ -1173,3 +1180,9 @@ https://github.com/emacs-eaf/emacs-application-framework (global-set-key (kbd "C-c +") 'increment-number-at-point) #+end_src +* HOWM +#+begin_src emacs-lisp +(use-package howm + :straight t + ) +#+end_src diff --git a/home/emacs/.emacs.d/init.el b/home/emacs/.emacs.d/init.el index 7f5c80e..f2a84a4 100644 --- a/home/emacs/.emacs.d/init.el +++ b/home/emacs/.emacs.d/init.el @@ -36,13 +36,12 @@ - -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) + (custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) (setq inhibit-startup-message t) (setq visible-bell t) @@ -67,7 +66,7 @@ (load-theme 'solarized-dark t nil) ;(column-number-mode) -(global-display-line-numbers-mode 0) +(global-display-line-numbers-mode 1) (dolist (mode '(org-mode-hook term-mode-hook shell-mode-hook @@ -213,6 +212,12 @@ :states 'motion :prefix "SPC") +(defun my/setup-org-margins() + (setq visual-fill-column-center-text t) + (visual-fill-column-mode t) + (visual-line-mode t) + ) + (defun my/org-mode-setup() (auto-fill-mode 0) (visual-line-mode 1) @@ -229,6 +234,7 @@ (org-mode . variable-pitch-mode) (org-mode . org-indent-mode) (org-mode . prettify-symbols-mode) + (org-mode . my/setup-org-margins) ) :config (require 'org-habit) @@ -238,6 +244,7 @@ (setq org-agenda-start-with-log-mode t) (setq org-log-done 'time) (setq org-log-into-drawer t) + (setq org-hide-emphasis-markers t) ;; Make sure org-indent face is available @@ -246,28 +253,28 @@ (add-hook 'org-agenda-finalize-hook #'hl-line-mode) - (set-face-attribute 'org-document-title nil :font "FiraSans" :weight 'bold :height 1.3) + (set-face-attribute 'org-document-title nil :font "mononoki" :weight 'bold :height 1.3) - (dolist (face '((org-level-1 . 1.2) - (org-level-2 . 1.1) - (org-level-3 . 1.0) - (org-level-4 . 1.0) - (org-level-5 . 1.0) - (org-level-6 . 1.0) - (org-level-7 . 1.0) - (org-level-8 . 1.0))) - (set-face-attribute (car face) nil :font "FiraSans" :weight 'bold :height (cdr face))) + ;; (dolist (face '((org-level-1 . 1.0) + ;; (org-level-2 . 1.0) + ;; (org-level-3 . 1.0) + ;; (org-level-4 . 1.0) + ;; (org-level-5 . 1.0) + ;; (org-level-6 . 1.0) + ;; (org-level-7 . 1.0) + ;; (org-level-8 . 1.0))) + ;; (set-face-attribute (car face) nil :font "mononoki" :weight 'bold :height (cdr face))) ;; Ensure that anything that should be fixed-pitch in Org files appears that way - (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) - (set-face-attribute 'org-table nil :inherit 'fixed-pitch) - (set-face-attribute 'org-formula nil :inherit 'fixed-pitch) - (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) + ;(set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-table nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-formula nil :inherit 'fixed-pitch) + ;(set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) ;(set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch)) - (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) - (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) - (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) - (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch) + ; (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + ;(set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) + ;(set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) + ; (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch) (setq org-agenda-files '( @@ -826,11 +833,11 @@ buffer's text scale." :host github :repo "emacs-eaf/emacs-application-framework" :files ("*.el" "*.py" "core" "app" "*.json") - :includes (eaf-pdf-viewer eaf-browser eaf-music-player eaf-image-viewer eaf-org-previewer eaf-markdown-previewer) ; Straight won't try to search for these packages when we make further use-package invocations for them + :includes ( eaf-browser ) ; Straight won't try to search for these packages when we make further use-package invocations for them - :pre-build (("python" "install-eaf.py" "--install" "pdf-viewer" "browser" "music-player" "image-viewer" "org-previewer" "markdown-previewer" "evil" "--ignore-sys-deps")) + :pre-build (("python" "install-eaf.py" "--install" "pdf-viewer" "browser" "evil" "--ignore-sys-deps")) ) :init (evil-set-initial-state 'eaf-mode 'emacs)) ; Evil mode doesn't work well with eaf keybindings. :config @@ -841,11 +848,6 @@ buffer's text scale." :custom (eaf-browser-continue-where-left-off t) (eaf-browser-enable-adblocker t)) -(use-package eaf-pdf-viewer) -(use-package eaf-music-player) -(use-package eaf-image-viewer) -(use-package eaf-org-previewer) -(use-package eaf-markdown-previewer) ;(setq spacemacs-cmds) @@ -961,10 +963,7 @@ buffer's text scale." (replace-match (number-to-string (1+ (string-to-number (match-string 0)))))) (global-set-key (kbd "C-c +") 'increment-number-at-point) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(org-agenda-files - '("/home/horhik/GTD/daily.org" "/home/horhik/GTD/tasks.org" "/home/horhik/GTD/inbox.org" "/home/horhik/GTD/done.org" "/home/horhik/GTD/projects.org" "/home/horhik/GTD/backlog.org" "/home/horhik/GTD/watchlist.org" "/home/horhik/GTD/readlist.org"))) + +(use-package howm + :straight t + )