summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs57
1 files changed, 52 insertions, 5 deletions
diff --git a/emacs b/emacs
index 51563ab..c6ddcd7 100644
--- a/emacs
+++ b/emacs
@@ -1,5 +1,5 @@
(set-face-attribute 'default nil :height 150)
-(set-frame-font "Iosevka Slab Extended" nil t)
+(set-frame-font "Iosevka SS13 Extended" nil t)
(menu-bar-mode -1)
(tool-bar-mode -1)
@@ -8,7 +8,8 @@
(pixel-scroll-precision-mode)
(delete-selection-mode 1)
(fset 'yes-or-no-p 'y-or-n-p)
-(setq initial-scratch-message "")
+(setq initial-scratch-message "{C-x p p sustainably <RET>}
+{C-x p p comma.directory <RET>}")
(setq-default frame-title-format '("%b"))
(setq ring-bell-function 'ignore)
(setq inhibit-startup-screen t)
@@ -69,6 +70,11 @@
;; Markdown
(add-hook 'markdown-mode-hook 'variable-pitch-mode)
(add-hook 'markdown-mode-hook 'visual-line-mode)
+(add-hook 'markdown-mode-hook 'markdown-toggle-url-hiding)
+(add-hook 'markdown-mode-hook 'markdown-toggle-markup-hiding)
+(add-hook 'markdown-mode-hook 'visual-line-mode)
+(require 'markdown-mode)
+(set-face-attribute 'markdown-code-face nil :inherit 'fixed-pitch)
;; Pairs
(electric-pair-mode 1)
@@ -95,6 +101,11 @@
(setq make-backup-files nil)
+(use-package go-mode
+ :ensure t
+ :hook ((before-save . eglot-format-buffer)))
+
+
;; X integration
(setq x-select-enable-clipboard t)
(setq x-select-enable-primary t)
@@ -132,7 +143,36 @@
mastodon-active-user "marcc"
mastodon-instance-url "https://fosstodon.org")
-
+;; Org
+
+(global-set-key (kbd "C-c l") #'org-store-link)
+(global-set-key (kbd "C-c a") #'org-agenda)
+(global-set-key (kbd "C-c c") #'org-capture)
+
+(require 'org)
+(setq org-agenda-files '("~/personal-db/notes"))
+(setq org-default-notes-file "~/personal-db/todo.org")
+(setq org-log-done 'time)
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(add-hook 'org-mode-hook 'org-indent-mode)
+(add-hook 'org-mode-hook 'visual-line-mode)
+(add-hook 'org-mode-hook 'variable-pitch-mode)
+(set-face-attribute 'org-block nil :inherit 'fixed-pitch)
+(set-face-attribute 'org-table nil :inherit 'fixed-pitch)
+
+(setq org-capture-templates
+ '(
+ ("t" "Todo"
+ entry (file+headline "~/personal-db/todo.org" "Todo")
+ "* TODO %?\n:Created: %T\n "
+ :empty-lines 0)
+ ("n" "Notes"
+ entry (file+headline "~/personal-db/notes/general.org" "Notes")
+ "** %?"
+ :empty-lines 0)))
+
+;; Magit
+(global-set-key (kbd "C-c g") 'magit)
;; Mu4e
(defun marc/set-msmtp-account ()
@@ -234,20 +274,24 @@
'(eglot-highlight-symbol-face ((t (:weight bold))))
'(eglot-mode-line ((t (:weight regular))))
'(erc-timestamp-face ((t (:foreground "blue" :weight bold))))
+ '(fixed-pitch ((t (:family "Iosevka SS13 Extended"))))
'(font-lock-builtin-face ((t (:weight regular))))
'(font-lock-comment-face ((t (:foreground "#0000FF" :slant normal))))
'(font-lock-constant-face ((t (:slant italic :weight regular))))
'(font-lock-function-name-face ((t (:weight regular))))
'(font-lock-keyword-face ((t (:weight regular))))
- '(font-lock-string-face ((t (:foreground "black"))))
+ '(font-lock-string-face ((t (:foreground "black" :slant italic))))
'(font-lock-type-face ((t (:foreground "black"))))
'(font-lock-variable-name-face ((t (:foreground "black"))))
'(header-line ((t (:inherit mode-line :background "white" :foreground "grey20" :box nil :underline "black"))))
'(highlight ((t (:background "white smoke"))))
+ '(markdown-inline-code-face ((t (:inherit markdown-code-face))))
+ '(markdown-pre-face ((t (:inherit markdown-code-face))))
'(mastodon-display-name-face ((t (:inherit nil :weight bold))))
'(mode-line ((t (:background "white" :foreground "black" :box (:line-width (1 . -1) :style flat-button) :overline "black"))))
'(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold))))
'(mu4e-highlight-face ((t (:inherit highlight))))
+ '(org-level-1 ((t (:inherit outline-1 :extend nil :weight bold))))
'(tldr-code-block ((t (:background "cornsilk" :foreground "black"))))
'(tldr-command-argument ((t (:background "cornsilk" :foreground "black"))))
'(tldr-command-itself ((t (:background "khaki" :foreground "black" :weight bold))))
@@ -261,11 +305,14 @@
;; If there is more than one, they won't work right.
'(custom-safe-themes
'("cbd85ab34afb47003fa7f814a462c24affb1de81ebf172b78cb4e65186ba59d2" default))
+ '(markdown-list-item-bullets '("-"))
'(mastodon-tl--enable-proportional-fonts t)
'(mastodon-use-emojify t)
'(mu4e-bookmarks
'((:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119)
(:name "Messages with images" :query "mime:image/*" :key 112)))
+ '(org-agenda-files '("~/personal-db/todo.org"))
+ '(org-fold-core-style 'overlays)
'(package-selected-packages
- '(smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)))
+ '(hyperbole smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)))
(put 'secrets-mode 'disabled nil)