summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/general.el46
-rw-r--r--lisp/org-custom.el10
2 files changed, 10 insertions, 46 deletions
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
"%?"