diff --git a/config.el b/config.el index 0e92383..a23e79c 100755 --- a/config.el +++ b/config.el @@ -67,7 +67,7 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) +(setq doom-theme 'ef-spring) (cnfonts-mode 1) (beacon-mode 1) (setq word-wrap-by-category t) @@ -96,9 +96,9 @@ (add-to-list 'default-frame-alist '(height . 35)) (add-to-list 'default-frame-alist '(width . 102)) -(setq doom-font (font-spec :size 16) - doom-big-font (font-spec :size 24) - doom-variable-pitch-font (font-spec :size 16)) +;; (setq doom-font (font-spec :size 16) +;; doom-big-font (font-spec :size 24) +;; doom-variable-pitch-font (font-spec :size 16)) ;; dashboard banner (defun doom-dashboard-draw-ascii-emacs-banner-fn () @@ -255,7 +255,7 @@ (default-input-method "rime") :config (define-key rime-mode-map (kbd "C-i") 'rime-force-enable) - (setq rime-show-candidate 'posframe) + (setq rime-show-candidate 'popup) (setq rime-disable-predicates '(rime-predicate-evil-mode-p rime-predicate-after-alphabet-char-p @@ -341,8 +341,6 @@ ;; (add-hook 'org-after-todo-statistics-hook 'org-summary-todo) (after! org (setq org-directory "~/org/" - org-ellipsis " ▼ " - org-superstar-headline-bullets-list '("◉" "●" "○" "◆" "●" "○" "◆") org-image-actual-width '(400) org-link-search-must-match-exact-headline nil org-log-done 'time @@ -352,27 +350,6 @@ (lambda() (org-roam-dailies-capture-today))) -(defun ql--find-files-in-dir (ext dir &optional rec) - "Find files with EXT in DIR. -REC searches recursively." - (split-string (shell-command-to-string - (concat - (format "fd --type f -e %s " ext) - (unless rec "-d 1 ") - (format ". %s" dir))))) - -(defun ql-org-ql--search (file &optional query) - "An Org-ql search allowing for the target FILE to be specified. -Additionally, QUERY can be chosen as well." - (let ((target file) - (query (or query (read-from-minibuffer "Query: ")))) - (funcall #'org-ql-search target query))) - -(defun my-org-ql-search-dailies (&optional query) - "Quickly search `ql-journal-directory' with optional QUERY." - (interactive) - (ql-org-ql--search (ql--find-files-in-dir 'org "~/Nextcloud/Note/org-roam/daily/") query)) - ;; ob-restclient (org-babel-do-load-languages 'org-babel-load-languages diff --git a/init.el b/init.el index d0df9ee..2c853e4 100755 --- a/init.el +++ b/init.el @@ -45,7 +45,7 @@ (popup +defaults) ; tame sudden yet inevitable temporary windows ;;tabs ; a tab bar for Emacs treemacs ; a project drawer, like neotree but cooler - ;;unicode ; extended unicode support for various languages + unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB ;;window-select ; visually switch windows @@ -96,7 +96,7 @@ ;;gist ; interacting with github gists lookup ; navigate your code and its documentation lsp ; M-x vscode - (magit +forge) ; a git porcelain for Emacs + magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds pdf ; pdf enhancements @@ -133,8 +133,7 @@ ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) ;;fsharp ; ML stands for Microsoft's Language ;;fstar ; (dependent) types and (monadic) effects and Z3 - (gdscript - +lsp) ; the language you waited for + ;;gdscript ; the language you waited for ;;(go +lsp) ; the hipster dialect ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python @@ -186,7 +185,7 @@ ;;zig ; C, but simpler :email - (mu4e +org +gmail) + (mu4e +org) ;;notmuch ;;(wanderlust +gmail) diff --git a/packages.el b/packages.el index 60aa3d3..4986f7a 100755 --- a/packages.el +++ b/packages.el @@ -58,6 +58,7 @@ (package! clippy) (package! parrot) (package! restclient) +(package! ef-themes) (package! ement :recipe (:host github :repo "alphapapa/ement.el")) @@ -84,3 +85,6 @@ (package! mastodon) (package! impatient-mode) + +(package! transient :pin "c2bdf7e12c530eb85476d3aef317eb2941ab9440") +(package! with-editor :pin "391e76a256aeec6b9e4cbd733088f30c677d965b")