theme update + minor fixes

3 files changed, 20 insertions, 52 deletions

diff --git a/init.el b/init.el
index 0079aa4..4365d53 100644
--- a/init.el
+++ b/init.el
@@ -37,10 +37,14 @@
 ;;   )
 
 
-(use-package kaolin-themes
+(use-package ef-themes
   :config
-  (load-theme 'kaolin-dark t)
-  (kaolin-treemacs-theme))
+  (load-theme 'ef-light t))
+
+;; (use-package kaolin-themes
+;;   :config
+;;   (load-theme 'kaolin-dark t)
+;;   (kaolin-treemacs-theme))
 
 (use-package autothemer
   :ensure t)
@@ -80,9 +84,9 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
-   '("a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
+   '("ec8ff5e2c8a9eb38e49a9bea6297c2194bbe0c03982630d66db1570f5ae83d90" "2ca3da7d36b0d326f984530a07be54b272b5c313b1361989acf747d8b5616162" "80214de566132bf2c844b9dee3ec0599f65c5a1f2d6ff21a2c8309e6e70f9242" "b3737f86b86d52c7d06820c10dc2609e9192627fc02dd654f4f9eb336f24f511" "a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
  '(package-selected-packages
-   '(eglot treemacs-nerd-icons treemacs-all-the-icons nerd-icons kaolin-themes ement dart-mode yaml-mode meson-mode autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
+   '(catppuccin-theme ef-themes org-attach-screenshot eglot treemacs-nerd-icons treemacs-all-the-icons nerd-icons kaolin-themes ement dart-mode yaml-mode meson-mode autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
  '(safe-local-variable-values '((js-indent-level . 4)))
  '(warning-suppress-types '((comp))))
 (custom-set-faces
@@ -106,7 +110,7 @@
  '(org-level-8 ((t (:inherit default :weight normal :foreground "#212121" :extend t :background nil :box nil :font "Iosevka"))))
  '(org-link ((t (:foreground "royal blue" :underline t))))
  '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch)))))
- '(org-property-value ((t (:inherit fixed-pitch))) t)
+ '(org-property-value ((t (:inherit fixed-pitch))))
  '(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch)))))
  '(org-table ((t (:inherit fixed-pitch :foreground "#83a598"))))
  '(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold :height 0.8))))
diff --git a/lisp/general.el b/lisp/general.el
index f8e6a78..d580e2c 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -155,6 +155,7 @@
   ;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch)
   ;;       orderless-component-separator #'orderless-escapable-split-on-space)
   (setq completion-styles '(orderless basic)
+        completion-ignore-case t
         completion-category-defaults nil
         completion-category-overrides '((file (styles partial-completion)))))
 
@@ -199,23 +200,6 @@
 
   )
 
-;; Tree
-;; (use-package treemacs
-;;   :ensure t
-;;   :config
-;;   (add-hook 'treemacs-mode-hook treemacs-filewatch-mode)
-;;   (add-hook 'treemacs-mode-hook treemacs-git-mode)
-;;   )
-
-;; (use-package treemacs-nerd-icons
-;;   :config
-;;   (treemacs-load-theme "nerd-icons"))
-
-;; (use-package treemacs-projectile
-;;   :ensure t
-;;   :after (treemacs projectile))
-;; (bind-key* (kbd "C-;") 'treemacs)
-
 
 ;; Git
 (use-package git-gutter
@@ -310,34 +294,6 @@
 	(face-remap-add-relative 'default '(:foreground"#fcfcfc"))
 	)
 
-(use-package vterm
-  :ensure t
-  :defer t
-  :config
-  (define-key vterm-mode-map (kbd "C-c C-c") 'vterm--self-insert)
-  )
-(add-hook 'vterm-mode-hook 'vterm-mode-set-colors)
-
-(use-package vterm-toggle
-  :ensure t
-  :config
-  (setq vterm-toggle-fullscreen-p nil)
-  (add-to-list 'display-buffer-alist
-               '((lambda (buffer-or-name _)
-                   (let ((buffer (get-buffer buffer-or-name)))
-                     (with-current-buffer buffer
-                       (or (equal major-mode 'vterm-mode)
-                           (string-prefix-p vterm-buffer-name (buffer-name buffer))))))
-                 (display-buffer-reuse-window display-buffer-at-bottom)
-                 ;;(display-buffer-reuse-window display-buffer-in-direction)
-                 ;;display-buffer-in-direction/direction/dedicated is added in emacs27
-                 ;;(direction . bottom)
-                 ;;(dedicated . t) ;dedicated is supported in emacs27
-                 (reusable-frames . visible)
-                 (window-height . 0.2)))
-  :after (vterm))
-(bind-key* (kbd "M-t") 'vterm-toggle)
-
 ;; Line movement
 (use-package drag-stuff
   :config
diff --git a/lisp/org-custom.el b/lisp/org-custom.el
index 8aa1417..573ddb3 100644
--- a/lisp/org-custom.el
+++ b/lisp/org-custom.el
@@ -51,6 +51,14 @@
 
 (setq org-src-fontify-natively t)
 
+(setq-default org-startup-indented t
+                  org-pretty-entities t
+                  org-use-sub-superscripts "{}"
+                  org-hide-emphasis-markers t
+                  org-startup-with-inline-images t
+                  org-image-actual-width '(300))
+(setq org-blank-before-new-entry '((heading . t) (plain-list-item . nil)))
+
 ;; (use-package org-alert
 ;;   :ensure t
 ;;   :config
@@ -77,7 +85,7 @@
       '(("d" "default" entry
          "* %?"
          :target (file+head "%<%Y-%m-%d>.org"
-                            "#+title: %<%Y-%m-%d> 📰 \n#+filetags: :dailies:\n\n* Plan 🛫 \n\n* Timeline 🍞\n\n* Notes 📁\n\n* Questions ❓\n\n"))))
+                            "#+title: %<%Y-%m-%d> 📰 \n#+filetags: :dailies: \n\n* Timeline 🍞\n\n* Notes 📁\n\n* Questions ❓\n\n"))))
   (setq org-roam-capture-templates
         '(("d" "default" plain
            "%?"