snippets and more

1 files changed, 39 insertions, 11 deletions

diff --git a/emacs b/emacs
index 22f1c01..772ea05 100644
--- a/emacs
+++ b/emacs
@@ -8,13 +8,14 @@
 (pixel-scroll-precision-mode)
 (delete-selection-mode 1)
 (fset 'yes-or-no-p 'y-or-n-p)
-(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)
 (setq line-spacing 0.2)
 
+(setq display-time-format "%a, %d/%m/%y %H:%M")
+(display-time)
+(tab-bar-mode)
 
 ;; Put Emacs auto-save and backup files to /tmp
 (defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory))
@@ -36,7 +37,11 @@
 		     rec-mode
 		     almost-mono-themes
 		     markdown-mode
+		     yasnippet
+		     yasnippet-snippets
 		     tldr
+		     elfeed
+		     yasnippet-snippets
 		     mastodon
 		     expand-region))
 
@@ -90,7 +95,7 @@
 ;; Eglot
 (require 'eglot)
 (define-key eglot-mode-map (kbd "C-c r") 'eglot-rename)
-(define-key eglot-mode-map (kbd "C-c o") 'eglot-code-actions-at-mouse)
+(define-key eglot-mode-map (kbd "C-c o") 'eglot-code-actions)
 (define-key eglot-mode-map (kbd "C-c h") 'eldoc)
 
 (add-hook 'go-mode-hook 'eglot-ensure)
@@ -136,9 +141,6 @@
 	"irc.libera.chat" :port "6667" :nick "mccd"
 	:password (shell-command-to-string "pass show libera.chat"))))
 
-(setq rmail-movemail-program "/nix/store/idfxv25n52wkwnw7y5ks6bk6x17xapkp-user-environment/bin/movemail")
-(setq rmail-primary-inbox-list '("maildir:///home/mccd/mail-home/"))
-
 (setq shr-max-image-proportion 0.3
 	mastodon-active-user "marcc"
 	mastodon-instance-url "https://fosstodon.org")
@@ -164,16 +166,20 @@
       '(    
         ("t" "Todo"
          entry (file+headline "~/personal-db/todo.org" "Todo")
-         "* TODO %?\n:Created: %T\n "
+         "* TODO %?\n%i\n%a\n:Created: %T\n "
          :empty-lines 0)
 	("n" "Notes"
 	 entry (file+headline "~/personal-db/notes/general.org" "Notes")
 	 "** %?"
-	 :empty-lines 0)))
+	 :empty-lines 1)))
 
 ;; Magit
 (global-set-key (kbd "C-c g") 'magit)
 
+;; Yasnippet
+(require 'yasnippet)
+(yas-global-mode 1)
+
 ;; Mu4e
 (defun marc/set-msmtp-account ()
   (if (message-mail-p)
@@ -239,6 +245,7 @@
                   (mu4e-sent-folder  . "/home/Sent")
                   (mu4e-refile-folder  . "/home/Archive")
                   (mu4e-trash-folder  . "/home/Trash")
+		  (mu4e-sent-messages-behavior . sent)
 
 		  (mu4e-maildir-shortcuts .
 					  (("/home/INBOX" . ?i)
@@ -274,6 +281,7 @@
  '(eglot-highlight-symbol-face ((t (:weight bold))))
  '(eglot-mode-line ((t (:weight regular))))
  '(erc-timestamp-face ((t (:foreground "blue" :weight bold))))
+ '(eww-valid-certificate ((t (:foreground "black" :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))))
@@ -283,15 +291,19 @@
  '(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"))))
+ '(fringe ((t (:background "white"))))
+ '(header-line ((t (:inherit nil :background "white" :foreground "grey20" :box (:line-width (2 . 2) :color "white") :underline (:color "gray50" :style line :position 0)))))
  '(highlight ((t (:background "white smoke"))))
+ '(info-header-xref ((t (:inherit info-xref :underline (:color "RoyalBlue3" :style line :position t)))))
  '(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"))))
+ '(mode-line ((t (:inherit variable-pitch :background "white" :foreground "black" :box (:line-width (2 . 2) :style flat-button) :overline "gray50"))))
+ '(mode-line-inactive ((t (:inherit mode-line :background "grey90" :foreground "grey20" :underline (:color "black" :style line :position 0) :weight light))))
  '(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))))
+ '(tab-bar ((t (:inherit variable-pitch :background "white" :foreground "gray20" :box (:line-width (4 . 4) :color "white" :style flat-button)))))
  '(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))))
@@ -308,11 +320,27 @@
  '(markdown-list-item-bullets '("-"))
  '(mastodon-tl--enable-proportional-fonts t)
  '(mastodon-use-emojify t)
+ '(mode-line-compact 'long)
+ '(mode-line-format
+   '("%e" mode-line-front-space
+     (:propertize
+      ("" mode-line-mule-info mode-line-client mode-line-modified mode-line-remote)
+      display
+      (min-width
+       (5.0)))
+     mode-line-frame-identification mode-line-buffer-identification "   " mode-line-position
+     (vc-mode vc-mode)
+     "  " mode-line-modes mode-line-end-spaces))
+ '(mode-line-percent-position nil)
+ '(mode-line-position-line-format '(" "))
  '(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
-   '(hyperbole smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)))
+   '(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))
 (put 'secrets-mode 'disabled nil)