From 5fb7dc9115b39c308400bff8e29d2e89aabea232 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 18 Nov 2021 12:19:51 -0500 Subject: Update doom config --- emacs/.doom.d/config.el | 2 +- emacs/.doom.d/init.el | 9 +++++---- emacs/.doom.d/packages.el | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 78be1df..af08fac 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -157,4 +157,4 @@ (add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode)) -(load "~/.doom.d/config.local.el" t) +(load-file "~/.doom.d/config.local.el") diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index a7ca077..6b76083 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -13,7 +13,7 @@ ;; ;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its ;; directory (for easy access to its source code). -(load "~/.doom.d/init.local.el" t) +(load-file "~/.doom.d/init.local.el") (doom! :input ;;chinese @@ -54,7 +54,8 @@ (evil +everywhere); come to the dark side, we have cookies file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding - (format +onsave) ; automated prettiness + format + ;; (format +onsave) ; automated prettiness ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who don't like vim multiple-cursors ; editing in many places at once @@ -107,7 +108,7 @@ :lang ;;agda ; types of types of types of types... - cc ; C/C++/Obj-C madness + ;;cc ; C/C++/Obj-C madness ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs @@ -152,7 +153,7 @@ ;;rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;scheme ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor diff --git a/emacs/.doom.d/packages.el b/emacs/.doom.d/packages.el index c746783..95c7e51 100644 --- a/emacs/.doom.d/packages.el +++ b/emacs/.doom.d/packages.el @@ -48,4 +48,4 @@ ;; (package! hledger-mode) -(load "~/.doom.d/packages.local.el" t) +(load-file "~/.doom.d/packages.local.el") -- cgit v1.2.3 From 3e6f22e2896286aab23afb62baef383ee9a0aaa2 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 18 Nov 2021 12:20:30 -0500 Subject: Update zsh config --- zsh/.zshenv | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/.zshenv b/zsh/.zshenv index 56bdd6a..0b39d67 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -8,3 +8,4 @@ PATH="$HOME/bin:$HOME/.emacs.d/bin:$PATH" alias e="emacsclient -n" alias dmenu=rofi alias dmenu_run="rofi -show run" +source ~/.zshenv.local -- cgit v1.2.3 From cae802844808235a0992f026af7194280e3f5f9e Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 20 Nov 2021 02:38:57 -0500 Subject: Update org config --- emacs/.doom.d/config.el | 130 ++++-------------------------------------------- emacs/.doom.d/init.el | 6 +-- 2 files changed, 14 insertions(+), 122 deletions(-) diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index af08fac..d6dbd48 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -28,133 +28,25 @@ ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! -(setq org-directory "~/org/") -(use-package! org - :config - (setq org-todo-keywords - '((sequence - "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)"))) - (setq org-refile-use-outline-path nil) - (setq org-refile-targets '((nil . (:maxlevel . 2))))) - +(setq org-directory "~/org") +(setq org-todo-keywords + '((sequence + "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)"))) +(setq org-refile-use-outline-path nil) +(setq org-refile-targets '((nil . (:maxlevel . 2)))) (setq org-log-into-drawer t) (setq org-agenda-log-mode-items '(closed clock state)) (setq org-agenda-files '("~/org/roam/todo.org")) - -(use-package! org-agenda - :config - (setq org-agenda-ndays 14) - (setq org-agenda-include-diary 1) - (setq org-agenda-todo-ignore-with-date 1) - (setq org-agenda-todo-ignore-scheduled 1) - (setq org-agenda-start-with-log-mode 1) - (setq org-agenda-window-setup 'current-window) - (setq org-agenda-custom-commands - '(("g" "Google agenda" - ((agenda "") - (todo "ACTIVE") - (alltodo)) - ))) - (setq org-capture-templates - `( - ("t" "Todo" entry (file+headline "~/org/roam/todo.org" "Inbox") - "* TODO %?\n %i\n %a") - ("d" "Daily review" entry (file+olp+datetree "~/org/review.org" "Daily") - (file "~/org/templates/daily-review.org") :tree-type week :jump-to-captured t) - ("w" "Weekly review" entry (file+olp+datetree "~/org/review.org" "Weekly") - (file "~/org/templates/weekly-review.org") :tree-type week :jump-to-captured t) - ("j" "Journal entry" entry (file+olp+datetree "~/org/journal.org" "Journal") - "* Journal entry\n%t\n\n%?" :tree-type week :jump-to-captured t) - ))) - -(use-package! org) -(use-package! org-roam - :after org - :init - (setq org-roam-directory "~/org/roam") - (setq org-roam-capture-templates - '( - ("d" "default" plain (function org-roam-capture--get-point) - "%?" - :file-name "%<%Y%m%d%H%M%S>-${slug}" - :head "#+TITLE: ${title}\n- tags :: [[file:%<%Y-W%W>.org][%<%Y-W%W>]]" - :unnarrowed t) - ))) - -(setq deft-directory "~/org/") +(setq org-roam-directory (concat org-directory "/roam")) +(setq org-roam-db-location (concat org-roam-directory "/org-roam.db")) +(setq deft-directory org-directory) (setq deft-recursive t) -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. -(setq display-line-numbers-type t) - -;; Here are some additional functions/macros that could help you configure Doom: -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k'). -;; This will open documentation for it, including demos of how they are used. -;; -;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how -;; they are implemented. - -(after! smartparens - (smartparens-global-mode -1)) - -(after! mu4e-maildirs-extension - (mu4e-maildirs-extension)) -(after! mu4e - (remove-hook 'mu4e-compose-mode-hook #'org-mu4e-compose-org-mode)) - -;; (setq hledger-jfile "~/.hledger.journal") - -;; (use-package! hledger-mode -;; :defer t -;; :mode ("\\.journal\\'" "\\.hledger\\'") -;; :commands hledger-enable-reporting -;; :preface -;; (defun hledger/next-entry () -;; "Move to next entry and pulse." -;; (interactive) -;; (hledger-next-or-new-entry) -;; (hledger-pulse-momentary-current-entry)) - -;; (defface hledger-warning-face -;; '((((background dark)) -;; :background "Red" :foreground "White") -;; (((background light)) -;; :background "Red" :foreground "White") -;; (t :inverse-video t)) -;; "Face for warning" -;; :group 'hledger) - -;; (defun hledger/prev-entry () -;; "Move to last entry and pulse." -;; (interactive) -;; (hledger-backward-entry) -;; (hledger-pulse-momentary-current-entry)) - -;; :config -;; (set-company-backend! 'hledger-mode '(hledger-company)) - -;; (map! :map hledger-mode-map -;; "M-p" #'hledger/prev-entry -;; "M-n" #'hledger/next-entry -;; :localleader -;; "e" #'hledger-jentry -;; "j" #'hledger-run-command) -;; ) +;; Allow more keys when navigating with avy. +(setq avy-keys (number-sequence ?a ?z)) (server-start) (remove-hook 'doom-first-buffer-hook #'smartparens-global-mode) - (add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode)) (load-file "~/.doom.d/config.local.el") diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index 6b76083..bfa7d6d 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -76,7 +76,7 @@ ;;eshell ; the elisp shell that works everywhere shell ; simple shell REPL for Emacs ;;term ; basic terminal emulator for Emacs - ;;vterm ; the best terminal emulation in Emacs + vterm ; the best terminal emulation in Emacs :checkers syntax ; tasing you for every semicolon you forget @@ -142,7 +142,7 @@ ;;nim ; python + lisp at the speed of c nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - (org +journal +roam) ; organize your plain life in plain text + (org +journal +roam2) ; organize your plain life in plain text ;;perl ; write code no one else can comprehend ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more @@ -165,7 +165,7 @@ ;;yaml ; JSON, but readable :email - mu4e + ;;mu4e ;;notmuch ;;(wanderlust +gmail) -- cgit v1.2.3 From 643801af5b59b1963933eb1c02e99c6ebdfec08c Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 20 Nov 2021 06:26:20 -0500 Subject: emacs config --- emacs/.doom.d/init.el | 1 + emacs/.doom.d/test.el | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 emacs/.doom.d/test.el diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index bfa7d6d..308059d 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -170,6 +170,7 @@ ;;(wanderlust +gmail) :app + everywhere ;;calendar ;;irc ; how neckbeards socialize ;;(rss +org) ; emacs as an RSS reader diff --git a/emacs/.doom.d/test.el b/emacs/.doom.d/test.el new file mode 100644 index 0000000..b8652be --- /dev/null +++ b/emacs/.doom.d/test.el @@ -0,0 +1,13 @@ +;;; test.el --- Description -*- lexical-binding: t; -*- +;;; Commentary: +;; Description +;;; Code: + +(defun test (&optional arg) + (let ((msg (or arg "World"))) + (message "Hello %s\n" msg))) + +(test) + +(provide 'test) +;;; test.el ends here -- cgit v1.2.3 From daf7184e85768587ab9e14eac50c3fe443a11512 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 20 Nov 2021 06:30:54 -0500 Subject: emacs: enable editorconfig --- emacs/.doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index 308059d..229ebfc 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -88,7 +88,7 @@ ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv ;;docker - ;;editorconfig ; let someone else argue about tabs vs spaces + editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists -- cgit v1.2.3 From 3d375d190ed8dc814e7a35fd98a4c48c9f1527dd Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 20 Nov 2021 06:33:37 -0500 Subject: enable treemacs --- emacs/.doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index 229ebfc..4be05b2 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -42,7 +42,7 @@ (popup +defaults) ; tame sudden yet inevitable temporary windows ;;pretty-code ; ligatures or substitute text with pretty symbols ;;tabs ; an tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler + treemacs ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB -- cgit v1.2.3 From 17253bd03d46423b7e453db9a6eb92ac5fe6733f Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 20 Nov 2021 06:38:42 -0500 Subject: emacs: enable emoji --- emacs/.doom.d/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index 4be05b2..495e75d 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -49,6 +49,7 @@ window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces ;;zen ; distraction-free coding or writing + (emoji +unicode) ; 😇 :editor (evil +everywhere); come to the dark side, we have cookies -- cgit v1.2.3