summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs19
1 files changed, 12 insertions, 7 deletions
diff --git a/emacs b/emacs
index e34fa0f..b31c767 100644
--- a/emacs
+++ b/emacs
@@ -1,12 +1,12 @@
(fset 'yes-or-no-p 'y-or-n-p)
-(set-face-attribute 'default nil :height 150)
+
;; Put Emacs auto-save and backup files to /tmp
(defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory))
(add-to-list 'load-path "~/.emacs.d/elisp")
-(setq
+(setq
;; Visual
inhibit-startup-screen t
line-spacing 0.2
@@ -57,9 +57,11 @@
mastodon
lem
expand-region)
+
package-archives '(("elpa" . "https://elpa.gnu.org")
("gnu" . "http://elpa.gnu.org/packages/")
("melpa" . "https://melpa.org/packages/")
+ ("non-gnu" . "https://elpa.nongnu.org/nongnu")
("melpa-stable" . "https://stable.melpa.org/packages/")))
(setq-default fill-column 80
@@ -86,6 +88,7 @@
(column-number-mode)
(line-number-mode)
(display-time-mode)
+(set-face-attribute 'default nil :height 150)
;; activate all thpe packages (in particular autoloads)
@@ -234,10 +237,14 @@
:init
(ido-mode t))
+(use-package org-link-minor-mode
+ :ensure nil)
(defvar marcc/timestamp-format "%H:%M "
"Format for H:M timestamp")
+
+
(defun marcc/timestamp-hour ()
"Insert a timestamp at the current point.
Uses `marcc/timestamp-format' for formatting the date/time."
@@ -252,11 +259,11 @@ Uses `marcc/timestamp-format' for formatting the date/time."
:hook
((diary-mode . variable-pitch-mode)
(diary-fancy-display-mode . variable-pitch-mode)
+ (diary-mode . org-link-minor-mode)
(diary-mode . flyspell-mode))
:config
(global-set-key (kbd "C-c d") 'calendar)
(calendar-set-date-style 'european)
- (define-key diary-mode-map (kbd "C-=") 'marcc/timestamp-hour)
(set-face-attribute 'diary nil :inherit 'fixed-pitch)
(setq diary-file "~/personal-db/log"
calendar-mark-diary-entries-flag t
@@ -293,8 +300,6 @@ Uses `marcc/timestamp-format' for formatting the date/time."
(use-package erc
:ensure t
- :hook
- ((erc-mode . flyspell-mode))
:config
(setq erc-autojoin-channels-alist
'(("Libera.Chat"
@@ -496,7 +501,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
(global-set-key (kbd "C-x w") 'elfeed))
(use-package mastodon
- :ensure t
+ :defer t
:config
(setq
mastodon-active-user "marcc"
@@ -575,7 +580,7 @@ Uses `marcc/timestamp-format' for formatting the date/time."
'("/home/mccd/personal-db/notes/carving-my-own-road.org" "/home/mccd/personal-db/notes/emacs-teaches.org" "/home/mccd/personal-db/notes/agency-and-tech.org" "/home/mccd/builds/sustainably/piva.org" "/home/mccd/builds/comma.directory/comma.org" "/home/mccd/personal-db/notes/frugal.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/todo.org"))
'(org-fold-core-style 'overlays)
'(package-selected-packages
- '(web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs))
+ '(orglink web-mode flycheck nix-mode nix-ts-mode avy pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs))
'(tab-bar-format
'(tab-bar-separator tab-bar-format-align-right tab-bar-format-global))
'(yank-from-kill-ring-rotate t))