From 47904cb736a67cadb9531a3862954ce8550c7cef Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 8 Jan 2020 00:44:47 -0500 Subject: [PATCH] emacs,guix: port init.el over to guix TODO: consider writing guix package definitions for these: - alloy-mode - george-mode - org-pdftools - oddmuse-curl - znc.el (my fork) --- .config/guix/channels.scm | 7 + .config/guix/manifest/chaman.scm | 27 +- .emacs.d/init.el | 429 ++++++++++++------------------- 3 files changed, 190 insertions(+), 273 deletions(-) create mode 100644 .config/guix/channels.scm diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm new file mode 100644 index 0000000..61a3d36 --- /dev/null +++ b/.config/guix/channels.scm @@ -0,0 +1,7 @@ +(list (channel + (name 'guix) + ;; (url "file:///home/bandali/src/git/guix") + (url "https://git.savannah.gnu.org/git/guix.git")) + (channel + (name 'guix-bandali) + (url "file:///home/bandali/src/git/guix-bandali"))) diff --git a/.config/guix/manifest/chaman.scm b/.config/guix/manifest/chaman.scm index 1e2dff2..5a41334 100644 --- a/.config/guix/manifest/chaman.scm +++ b/.config/guix/manifest/chaman.scm @@ -5,18 +5,18 @@ "emacs" "emacs-alert" "emacs-async" + "emacs-biblio-git" "emacs-boxquote" "emacs-company" "emacs-company-ebdb" "emacs-crux" "emacs-dash" "emacs-debbugs" - "emacs-delight" "emacs-diff-hl" - ;; "emacs-doom-themes" + "emacs-doom-themes" "emacs-ebdb" "emacs-emmet-mode" - "emacs-emojify" + ;; "emacs-emojify" "emacs-erc-hl-nicks" "emacs-erc-scrolltoplace" "emacs-eshell-up" @@ -25,16 +25,17 @@ "emacs-flycheck" "emacs-geiser" ;; "emacs-gnus-harvest" - "emacs-go-mode" "emacs-guix" "emacs-helpful" "emacs-hl-todo" "emacs-ivy" "emacs-magit" "emacs-message-x" - "emacs-multi-term" + "emacs-minions" + ;; "emacs-multi-term" "emacs-multiple-cursors" "emacs-mwim" + "emacs-no-littering" "emacs-org" "emacs-org-contrib" "emacs-org-ref" @@ -43,7 +44,7 @@ "emacs-pass" "emacs-pinentry" "emacs-projectile" - "emacs-shrink-path" + "emacs-shrink-path-git" "emacs-smart-mode-line" "emacs-smex" "emacs-typo" @@ -59,7 +60,7 @@ "font-linuxlibertine" "font-sil-gentium" "font-tex-gyre" - "font-ubuntu" + ;; "font-ubuntu" "getmail" "gettext" "gimp" @@ -72,26 +73,28 @@ "hunspell" "hunspell-dict-en-ca" "hunspell-dict-en-us" - "icecat" + ;; "icecat" "inkscape" "isync" "mpv" "msmtp" "ncdu" "notmuch" + "openssh" "openssl" "password-store" "pinentry-emacs" - "poppler" ;for 'pdffonts' + "poppler" ; for 'pdffonts' "rsync" "rtv" "screen" "setxkbmap" - "texlive" - ;"texlive-base" + ;; "texlive" + ;; "texlive-base" "thinkfan" + "wget" "xdg-user-dirs" - ;"xkbcomp" + ;; "xkbcomp" "xmodmap" "xrdb" "youtube-dl")) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 055e664..a043652 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,6 +1,6 @@ ;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- -;; Copyright (C) 2018-2019 Amin Bandali +;; Copyright (C) 2018-2020 Amin Bandali ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -18,8 +18,10 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, free -;; software activist, GNU maintainer & webmaster. Uses straight.el -;; for purely functional and fully reproducible package management. +;; software activist, GNU maintainer & webmaster. Packages are +;; installed from GNU Guix, for purely functional and fully +;; reproducible package management. Before switching to GNU Guix, +;; I used straight.el for package management, and before that, Borg. ;; Over the years, I've taken inspiration from configurations of many ;; great people. Some that I can remember off the top of my head are: @@ -94,80 +96,16 @@ ;;; Package management -;; No package.el (for emacs 26 and before, uncomment the following) -;; Not necessary when using straight.el -;; (C-h v straight-package-neutering-mode RET) - -(when (and - (not (featurep 'straight)) - (version< emacs-version "27")) +;; No package.el (for emacs 26 and before) +(when (version< emacs-version "27") (setq package-enable-at-startup nil) ;; (package-initialize) ) - ;; for emacs 27 and later, we use early-init.el. see ;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b -;; straight.el - -;; Main engine start... - -(setq straight-repository-branch "develop" - straight-check-for-modifications '(check-on-save find-when-checking)) - -(defun b/bootstrap-straight () - (defvar bootstrap-version) - (let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 5)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage))) - -;; Solid rocket booster ignition... - -(b/bootstrap-straight) - -;; We have lift off! - -(setq straight-use-package-by-default t) - -(defmacro use-feature (name &rest args) - "Like `use-package', but with `straight-use-package-by-default' disabled." - (declare (indent 1)) - `(use-package ,name - :straight nil - ,@args)) - -(with-eval-after-load 'use-package-core - (let ((upflk (car use-package-font-lock-keywords))) - (font-lock-add-keywords - 'emacs-lisp-mode - `((,(replace-regexp-in-string - "use-package" "use-feature" - (car upflk)) - ,@(cdr upflk)))))) - -(with-eval-after-load 'recentf - (add-to-list 'recentf-exclude - (expand-file-name "~/.emacs.d/straight/build/"))) - -(defun b/reload-init () - "Reload `user-init-file'." - (interactive) - (setq b/before-user-init-time (current-time) - b/file-name-handler-alist file-name-handler-alist) - (load user-init-file nil 'nomessage) - (b/post-init)) ;; use-package -(straight-use-package 'use-package) - (if nil ; set to t when need to debug init (progn (setq use-package-verbose t @@ -195,7 +133,7 @@ (defalias 'b/var 'no-littering-expand-var-file-name)) ;; separate custom file (don't want it mixing with init.el) -(use-feature custom +(use-package custom :no-require :config (setq custom-file (b/etc "custom.el")) @@ -228,7 +166,7 @@ ;; start up emacs server. see ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server -(use-feature server +(use-package server :defer 0.4 :config (or (server-running-p) (server-mode))) @@ -357,7 +295,7 @@ For disabling the behaviour for certain buffers and/or modes." ;;;; Elisp-level customizations -(use-feature startup +(use-package startup :no-require :demand :config @@ -376,7 +314,7 @@ For disabling the behaviour for certain buffers and/or modes." (inhibit-startup-screen t) (inhibit-startup-echo-area-message user-login-name)) -(use-feature files +(use-package files :no-require :demand :custom @@ -403,7 +341,7 @@ For disabling the behaviour for certain buffers and/or modes." (defalias 'yes-or-no-p #'y-or-n-p) ;; enable automatic reloading of changed buffers and files -(use-feature autorevert +(use-package autorevert :demand :config (global-auto-revert-mode 1) @@ -412,7 +350,7 @@ For disabling the behaviour for certain buffers and/or modes." (global-auto-revert-non-file-buffers nil)) ;; time and battery in mode-line -(use-feature time +(use-package time :if b/exwm-p :demand :config @@ -423,7 +361,7 @@ For disabling the behaviour for certain buffers and/or modes." (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center)) (display-time-use-mail-icon t)) -(use-feature battery +(use-package battery :if b/exwm-p :demand :config @@ -431,20 +369,20 @@ For disabling the behaviour for certain buffers and/or modes." :custom (battery-mode-line-format " %p%% %t")) -(use-feature fringe +(use-package fringe :demand :config ;; smaller fringe ;; (fringe-mode '(3 . 1)) (fringe-mode nil)) -(use-feature winner +(use-package winner :demand :config ;; enable winner-mode (C-h f winner-mode RET) (winner-mode 1)) -(use-feature compile +(use-package compile :config ;; don't display *compilation* buffer on success. based on ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' @@ -467,7 +405,7 @@ For disabling the behaviour for certain buffers and/or modes." ad-do-it)) (ad-activate 'compilation-start)) -(use-feature isearch +(use-package isearch :custom ;; allow scrolling in Isearch (isearch-allow-scroll t) @@ -479,44 +417,47 @@ For disabling the behaviour for certain buffers and/or modes." ;; uncomment to extend the above behaviour to query-replace (comment - (use-feature replace + (use-package replace :custom (replace-char-fold t))) -(use-feature vc +(use-package vc :bind ("C-x v C-=" . vc-ediff)) -(use-feature vc-git +(use-package vc-git :after vc :custom (vc-git-print-log-follow t)) -(use-feature ediff +(use-package ediff :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) (ediff-split-window-function 'split-window-horizontally))) -(use-feature face-remap +(use-package face-remap :custom ;; gentler font resizing (text-scale-mode-step 1.05)) -(use-feature mwheel +(use-package mwheel :defer 0.4 :config (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time mouse-wheel-progressive-speed nil ; don't accelerate scrolling mouse-wheel-follow-mouse t)) ; scroll window under mouse -(use-feature pixel-scroll +(use-package pixel-scroll :defer 0.4 :config (pixel-scroll-mode 1)) -(use-feature epg-config +(use-package epg-config :custom - ((epg-gpg-program (executable-find "gpg")))) + (epg-gpg-program (executable-find "gpg"))) -(use-feature auth-source +(use-package epg + :after epg-config) + +(use-package auth-source :custom (auth-sources '("~/.authinfo.gpg")) (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) @@ -565,32 +506,6 @@ For disabling the behaviour for certain buffers and/or modes." ;; ("" . switch-to-buffer) ) -(bind-keys - :prefix-map b/straight-prefix-map - :prefix "C-c p s" - ("u" . straight-use-package) - ("f" . straight-freeze-versions) - ("t" . straight-thaw-versions) - ("P" . straight-prune-build) - ("g" . straight-get-recipe) - ("r" . b/reload-init) - ;; M-x ^straight-.*-all$ - ("a c" . straight-check-all) - ("a f" . straight-fetch-all) - ("a m" . straight-merge-all) - ("a n" . straight-normalize-all) - ("a F" . straight-pull-all) - ("a P" . straight-push-all) - ("a r" . straight-rebuild-all) - ;; M-x ^straight-.*-package$ - ("p c" . straight-check-package) - ("p f" . straight-fetch-package) - ("p m" . straight-merge-package) - ("p n" . straight-normalize-package) - ("p F" . straight-pull-package) - ("p P" . straight-push-package) - ("p r" . straight-rebuild-package)) - ;;; Essential packages @@ -610,12 +525,12 @@ For disabling the behaviour for certain buffers and/or modes." :hook ((exwm-update-class . b/exwm-rename-buffer) (exwm-update-title . b/exwm-rename-buffer))) -(use-feature exwm-config +(use-package exwm-config :demand :after exwm :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame)) -(use-feature exwm-input +(use-package exwm-input :demand :after exwm :config @@ -765,7 +680,7 @@ around if needed." ([?\s-s] . [?\C-s]) ([?\C-g] . [escape])))) -(use-feature exwm-manage +(use-package exwm-manage :demand :after exwm :hook @@ -785,7 +700,7 @@ around if needed." '(([?\C-p] . [C-up]) ([?\C-n] . [C-down]))))))))) -(use-feature exwm-randr +(use-package exwm-randr :demand :after exwm :config @@ -793,13 +708,13 @@ around if needed." :custom (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))) -(use-feature exwm-systemtray +(use-package exwm-systemtray :demand :after exwm :config (exwm-systemtray-enable)) -(use-feature exwm-workspace) +(use-package exwm-workspace) (use-package exwm-edit :demand @@ -808,7 +723,7 @@ around if needed." ;; use the org-plus-contrib package to get the whole deal (use-package org-plus-contrib) -(use-feature org +(use-package org :defer 0.5 :config (setq org-src-tab-acts-natively t @@ -847,7 +762,7 @@ around if needed." '(org-block ((t (:background "#1d1f21")))) '(org-latex-and-related ((t (:foreground "#b294bb"))))) -(use-feature ox-latex +(use-package ox-latex :after ox :config (setq org-latex-listings 'listings @@ -863,7 +778,7 @@ around if needed." t) (require 'ox-beamer)) -(use-feature ox-extra +(use-package ox-extra :config (ox-extras-activate '(latex-header-blocks ignore-headlines))) @@ -933,7 +848,7 @@ around if needed." :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files -(use-feature recentf +(use-package recentf :defer 0.2 ;; :config ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") @@ -952,7 +867,7 @@ around if needed." ("C-c x" . execute-extended-command)) (comment - (use-feature ido + (use-package ido :demand :bind (:map ido-common-completion-map @@ -995,7 +910,7 @@ around if needed." :config (crm-custom-mode 1)) - (use-feature icomplete + (use-package icomplete :defer 0.3 :config (icomplete-mode 1))) @@ -1074,7 +989,7 @@ This function is intended for use with `ivy-ignore-buffers'." ("C-z" . helm-select-action)) ; List actions :config (helm-mode 1))) -(use-feature eshell +(use-package eshell :defer 0.5 :commands eshell :bind ("C-c a s e" . eshell) @@ -1109,7 +1024,7 @@ This function is intended for use with `ivy-ignore-buffers'." (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) -(use-feature ibuffer +(use-package ibuffer :bind (("C-x C-b" . ibuffer) :map ibuffer-mode-map @@ -1159,7 +1074,7 @@ This function is intended for use with `ivy-ignore-buffers'." (mode . scheme-mode) (mode . haskell-mode) (mode . lean-mode) - (mode . go-mode) + ;; (mode . go-mode) (mode . alloy-mode))) ("tex" (or @@ -1184,7 +1099,7 @@ This function is intended for use with `ivy-ignore-buffers'." " " filename))) :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) -(use-feature outline +(use-package outline :disabled :hook (prog-mode . outline-minor-mode) :bind @@ -1202,10 +1117,10 @@ This function is intended for use with `ivy-ignore-buffers'." ("h" . outline-hide-subtree) ("s" . outline-show-subtree))) -(use-feature ls-lisp +(use-package ls-lisp :custom (ls-lisp-dirs-first t)) -(use-feature dired +(use-package dired :config (setq dired-dwim-target t dired-listing-switches "-alh" @@ -1255,12 +1170,12 @@ This function is intended for use with `ivy-ignore-buffers'." (b/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) -(use-feature help +(use-package help :config (temp-buffer-resize-mode) (setq help-window-select t)) -(use-feature tramp +(use-package tramp :config (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) @@ -1270,7 +1185,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package dash :config (dash-enable-font-lock)) -(use-feature doc-view +(use-package doc-view :bind (:map doc-view-mode-map ("M-RET" . image-previous-line))) @@ -1286,20 +1201,20 @@ This function is intended for use with `ivy-ignore-buffers'." :hook (magit-post-refresh . diff-hl-magit-post-refresh)) ;; display Lisp objects at point in the echo area -(use-feature eldoc +(use-package eldoc :when (version< "25" emacs-version) :config (global-eldoc-mode)) ;; highlight matching parens -(use-feature paren +(use-package paren :demand :config (show-paren-mode)) -(use-feature elec-pair +(use-package elec-pair :demand :config (electric-pair-mode)) -(use-feature simple +(use-package simple :config (column-number-mode) :custom ;; Save what I copy into clipboard from other applications into Emacs' @@ -1309,32 +1224,32 @@ This function is intended for use with `ivy-ignore-buffers'." (save-interprogram-paste-before-kill t)) ;; save minibuffer history -(use-feature savehist +(use-package savehist :demand :config (savehist-mode) (add-to-list 'savehist-additional-variables 'kill-ring)) ;; automatically save place in files -(use-feature saveplace +(use-package saveplace :when (version< "25" emacs-version) :config (save-place-mode)) -(use-feature prog-mode +(use-package prog-mode :config (global-prettify-symbols-mode) (defun indicate-buffer-boundaries-left () (setq indicate-buffer-boundaries 'left)) (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) -(use-feature text-mode +(use-package text-mode :bind (:map text-mode-map ("C-*" . b/insert-asterism)) :hook ((text-mode . indicate-buffer-boundaries-left) (text-mode . flyspell-mode))) -(use-feature conf-mode +(use-package conf-mode :mode "\\.*rc$") -(use-feature sh-mode +(use-package sh-mode :mode "\\.bashrc$") (use-package company @@ -1369,10 +1284,10 @@ This function is intended for use with `ivy-ignore-buffers'." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-feature flyspell) +(use-package flyspell) ;; http://endlessparentheses.com/ispell-and-apostrophes.html -(use-feature ispell +(use-package ispell :defer 0.6 :config ;; ’ can be part of a word @@ -1398,42 +1313,42 @@ This function is intended for use with `ivy-ignore-buffers'." (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) -(use-feature abbrev +(use-package abbrev :hook (text-mode . abbrev-mode)) ;;; Programming modes -(use-feature lisp-mode +(use-package lisp-mode :config (defun indent-spaces-mode () (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-feature reveal +(use-package reveal :hook (emacs-lisp-mode . reveal-mode)) -(use-feature elisp-mode) - -(use-package alloy-mode - :straight (:host github :repo "dwwmmn/alloy-mode") - :mode "\\.\\(als\\|dsh\\)\\'" - :config - (setq alloy-basic-offset 2) - ;; (defun b/alloy-simple-indent (start end) - ;; (interactive "r") - ;; ;; (if (region-active-p) - ;; ;; (indent-rigidly start end alloy-basic-offset) - ;; ;; (if (bolp) - ;; ;; (indent-rigidly (line-beginning-position) - ;; ;; (line-end-position) - ;; ;; alloy-basic-offset))) - ;; (indent-to (+ (current-column) alloy-basic-offset))) - :bind (:map alloy-mode-map - ("RET" . electric-newline-and-maybe-indent) - ;; ("TAB" . b/alloy-simple-indent) - ("TAB" . indent-for-tab-command)) - :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) +(use-package elisp-mode) + +;; (use-package alloy-mode +;; :straight (:host github :repo "dwwmmn/alloy-mode") +;; :mode "\\.\\(als\\|dsh\\)\\'" +;; :config +;; (setq alloy-basic-offset 2) +;; ;; (defun b/alloy-simple-indent (start end) +;; ;; (interactive "r") +;; ;; ;; (if (region-active-p) +;; ;; ;; (indent-rigidly start end alloy-basic-offset) +;; ;; ;; (if (bolp) +;; ;; ;; (indent-rigidly (line-beginning-position) +;; ;; ;; (line-end-position) +;; ;; ;; alloy-basic-offset))) +;; ;; (indent-to (+ (current-column) alloy-basic-offset))) +;; :bind (:map alloy-mode-map +;; ("RET" . electric-newline-and-maybe-indent) +;; ;; ("TAB" . b/alloy-simple-indent) +;; ("TAB" . indent-for-tab-command)) +;; :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil)))) (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode @@ -1477,11 +1392,11 @@ This function is intended for use with `ivy-ignore-buffers'." ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el ) -(use-feature sgml-mode +(use-package sgml-mode :config (setq sgml-basic-offset 2)) -(use-feature css-mode +(use-package css-mode :config (setq css-indent-offset 2)) @@ -1578,7 +1493,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package geiser) -(use-feature geiser-guile +(use-package geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) @@ -1589,13 +1504,14 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (font-latex-fontify-sectioning 'color))) -(use-package go-mode) +(use-package go-mode + :disabled) (use-package po-mode :hook (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) -(use-feature tex-mode +(use-package tex-mode :config (cl-delete-if (lambda (p) (string-match "^---?" (car p))) @@ -1603,9 +1519,9 @@ This function is intended for use with `ivy-ignore-buffers'." :hook ((tex-mode . auto-fill-mode) (tex-mode . flyspell-mode))) -(use-package george-mode - :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") - :mode "\\.grg\\'") +;; (use-package george-mode +;; :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode") +;; :mode "\\.grg\\'") ;;; Theme @@ -1707,10 +1623,6 @@ This function is intended for use with `ivy-ignore-buffers'." ;; prefixes for global prefixes and minor modes "C-c @" "outline" "C-c !" "flycheck" - ;; "C-c 8" "typo" - ;; "C-c 8 -" "typo/dashes" - ;; "C-c 8 <" "typo/left-brackets" - ;; "C-c 8 >" "typo/right-brackets" "C-x RET" "coding system" "C-x 8" "unicode" "C-x @" "event modifiers" @@ -1735,14 +1647,10 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c g" "magit" "C-S-h" "help(ful)" "C-c m" "multiple-cursors" - "C-c P" "projectile" - "C-c P s" "projectile/search" - "C-c P x" "projectile/execute" - "C-c P 4" "projectile/other-window" - "C-c p" "package management" - "C-c ps" "straight" - "C-c psa" "all" - "C-c psp" "package" + "C-c p" "projectile" + "C-c p s" "projectile/search" + "C-c p x" "projectile/execute" + "C-c p 4" "projectile/other-window" "C-c q" "boxquote" "C-c t" "themes" ;; "s-O" "outline" @@ -1783,7 +1691,7 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package projectile :defer 0.5 - :bind-keymap ("C-c P" . projectile-command-map) + :bind-keymap ("C-c p" . projectile-command-map) :config (projectile-mode) @@ -1871,7 +1779,7 @@ This function is intended for use with `ivy-ignore-buffers'." :hook (((text-mode erc-mode web-mode) . typo-mode) ((tex-mode git-commit-mode) . (lambda ()(typo-mode -1))))) -(use-feature electric +(use-package electric :disabled :demand :config @@ -1978,6 +1886,7 @@ This function is intended for use with `ivy-ignore-buffers'." ("a" . mc/mark-all-like-this)))) (use-package forge + :disabled :demand :after magit) @@ -2002,10 +1911,6 @@ This function is intended for use with `ivy-ignore-buffers'." (yas-global-mode)) (use-package debbugs - :straight (debbugs - :host github - :repo "emacs-straight/debbugs" - :files (:defaults "Debbugs.wsdl")) :bind (("C-c D d" . debbugs-gnu) ("C-c D b" . debbugs-gnu-bugs) @@ -2044,7 +1949,7 @@ This function is intended for use with `ivy-ignore-buffers'." :disabled :hook (erc-mode . emojify-mode)) -(use-feature window +(use-package window :bind (("C-c w e" . (lambda () (interactive) @@ -2063,7 +1968,7 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (split-width-threshold 150)) -(use-feature windmove +(use-package windmove :defer 0.6 :bind (("C-c w h" . windmove-left) @@ -2096,6 +2001,7 @@ This function is intended for use with `ivy-ignore-buffers'." :custom (pdf-view-resize-factor 1.05)) (use-package org-pdftools + :disabled :straight (:host github :repo "fuxialexander/org-pdftools") :demand :after org @@ -2105,10 +2011,10 @@ This function is intended for use with `ivy-ignore-buffers'." (use-package biblio) -(use-feature reftex +(use-package reftex :hook (latex-mode . reftex-mode)) -(use-feature reftex-cite +(use-package reftex-cite :after reftex :disabled ; enable to disable ; reftex-cite's default choice @@ -2155,17 +2061,17 @@ This function is intended for use with `ivy-ignore-buffers'." :files ("*.el" ("kotl" "kotl/*.el") "DEMO" "man/*.info" "man/*.texi"))) -(use-package oddmuse-curl - :straight (:host github :repo "kensanata/oddmuse-curl") - :config - (setq - oddmuse-wikis - (append - '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil) - ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil)) - oddmuse-wikis)) - :custom - (oddmuse-username "bandali")) +;; (use-package oddmuse-curl +;; :straight (:host github :repo "kensanata/oddmuse-curl") +;; :config +;; (setq +;; oddmuse-wikis +;; (append +;; '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil) +;; ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil)) +;; oddmuse-wikis)) +;; :custom +;; (oddmuse-username "bandali")) (use-package debpaste :custom @@ -2189,7 +2095,7 @@ This function is intended for use with `ivy-ignore-buffers'." mail-user-agent 'gnus-user-agent read-mail-command 'gnus) -(use-feature gnus +(use-package gnus :bind (("s-m" . gnus) ("s-M" . gnus-unplugged) ("C-c a m" . gnus) @@ -2408,17 +2314,18 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-gcc-mark-as-read t) :config (when (version< emacs-version "27") - (add-to-list - 'nnmail-split-abbrev-alist - '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop") - t)) + (with-eval-after-load 'nnmail + (add-to-list + 'nnmail-split-abbrev-alist + '(list . "list-id\\|list-post\\|x-mailing-list\\|x-beenthere\\|x-loop") + t))) ;; (gnus-registry-initialize) (with-eval-after-load 'recentf (add-to-list 'recentf-exclude gnus-home-directory))) -(use-feature gnus-art +(use-package gnus-art :config (setq gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") @@ -2467,7 +2374,7 @@ This function is intended for use with `ivy-ignore-buffers'." :map gnus-article-mode-map ("M-L" . org-store-link))) -(use-feature gnus-sum +(use-package gnus-sum :bind (:map gnus-summary-mode-map :prefix-map b/gnus-summary-prefix-map :prefix "v" @@ -2484,7 +2391,7 @@ This function is intended for use with `ivy-ignore-buffers'." gnus-thread-sort-by-subject gnus-thread-sort-by-date))) -(use-feature gnus-msg +(use-package gnus-msg :config (defvar b/shemshak-signature "Amin Bandali https://shemshak.org/~amin") @@ -2526,56 +2433,56 @@ https://csclub.uwaterloo.ca/~abandali") (unless (mml-secure-is-encrypted-p) (mml-secure-message-sign))))) -(use-feature gnus-topic +(use-package gnus-topic :hook (gnus-group-mode . gnus-topic-mode) :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n")) -(use-feature gnus-agent +(use-package gnus-agent :config (setq gnus-agent-synchronize-flags 'ask) :hook (gnus-group-mode . gnus-agent-mode)) -(use-feature gnus-group +(use-package gnus-group :config (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)")) (comment ;; problematic with ebdb's popup, *EBDB-Gnus* - (use-feature gnus-win + (use-package gnus-win :config (setq gnus-use-full-window nil))) -(use-feature gnus-dired +(use-package gnus-dired :commands gnus-dired-mode :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) (comment - (use-feature gnus-utils + (use-package gnus-utils :custom (gnus-completing-read-function 'gnus-ido-completing-read))) -(use-feature mm-decode +(use-package mm-decode :config (setq mm-discouraged-alternatives '("text/html" "text/richtext") mm-decrypt-option 'known mm-verify-option 'known)) -(use-feature mm-uu +(use-package mm-uu :config (set-face-attribute 'mm-uu-extract nil :extend t) :custom (mm-uu-diff-groups-regexp "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)")) -(use-feature sendmail +(use-package sendmail :config (setq sendmail-program (executable-find "msmtp") ;; message-sendmail-extra-arguments '("-v" "-d") mail-specify-envelope-from t mail-envelope-from 'header)) -(use-feature message +(use-package message :bind (:map message-mode-map ("" . b/insert-asterism)) :config ;; redefine for a simplified In-Reply-To header @@ -2624,14 +2531,14 @@ https://csclub.uwaterloo.ca/~abandali") :custom (message-elide-ellipsis "[...]\n")) -(use-feature mml) +(use-package mml) -(use-feature mml-sec +(use-package mml-sec :custom (mml-secure-openpgp-encrypt-to-self t) (mml-secure-openpgp-sign-with-sender t)) -(use-feature footnote +(use-package footnote :after message ;; :config ;; (setq footnote-start-tag "" @@ -2669,16 +2576,16 @@ https://csclub.uwaterloo.ca/~abandali") (with-eval-after-load 'swiper (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) -(use-feature ebdb-com +(use-package ebdb-com :after ebdb) -(use-feature ebdb-complete +(use-package ebdb-complete :after ebdb :config ;; (setq ebdb-complete-mail 'capf) (ebdb-complete-enable)) -(use-feature ebdb-message +(use-package ebdb-message :demand :after ebdb) @@ -2686,12 +2593,12 @@ https://csclub.uwaterloo.ca/~abandali") ;; :config ;; (defun company-ebdb--post-complete (_) nil)) -(use-feature ebdb-gnus +(use-package ebdb-gnus :after ebdb :custom (ebdb-gnus-window-size 0.3)) -(use-feature ebdb-mua +(use-package ebdb-mua :demand :after ebdb :custom (ebdb-mua-pop-up t)) @@ -2725,7 +2632,7 @@ https://csclub.uwaterloo.ca/~abandali") (gnus-harvest-install 'message-x) (gnus-harvest-install)))) -(use-feature gnus-article-treat-patch +(use-package gnus-article-treat-patch :disabled :demand :load-path "lisp/" @@ -2738,7 +2645,7 @@ https://csclub.uwaterloo.ca/~abandali") ;;; IRC (with ERC and ZNC) -(use-feature erc +(use-package erc :bind (("C-c b b" . erc-switch-to-buffer) :map erc-mode-map ("M-a" . erc-track-switch-buffer)) @@ -2766,19 +2673,19 @@ https://csclub.uwaterloo.ca/~abandali") (add-to-list 'erc-modules 'scrolltoplace) (erc-update-modules)) -(use-feature erc-fill +(use-package erc-fill :after erc :custom (erc-fill-column 77) (erc-fill-function 'erc-fill-static) (erc-fill-static-center 18)) -(use-feature erc-pcomplete +(use-package erc-pcomplete :after erc :custom (erc-pcomplete-nick-postfix ", ")) -(use-feature erc-track +(use-package erc-track :after erc :bind (("C-c a e t d" . erc-track-disable) ("C-c a e t e" . erc-track-enable)) @@ -2796,22 +2703,22 @@ https://csclub.uwaterloo.ca/~abandali") (use-package erc-scrolltoplace :after erc) -(use-package znc - :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") - :bind (("C-c a e e" . znc-erc) - ("C-c a e a" . znc-all)) - :config - (let ((pwd (let ((auth (auth-source-search :host "znca"))) - (cond - ((null auth) (error "Couldn't find znca's authinfo")) - (t (funcall (plist-get (car auth) :secret))))))) - (setq znc-servers - `(("znc.shemshak.org" 1337 t - ((freenode "amin/freenode" ,pwd))) - ("znc.shemshak.org" 1337 t - ((moznet "amin/moznet" ,pwd))) - ("znc.shemshak.org" 1337 t - ((oftc "amin/oftc" ,pwd))))))) +;; (use-package znc +;; :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") +;; :bind (("C-c a e e" . znc-erc) +;; ("C-c a e a" . znc-all)) +;; :config +;; (let ((pwd (let ((auth (auth-source-search :host "znca"))) +;; (cond +;; ((null auth) (error "Couldn't find znca's authinfo")) +;; (t (funcall (plist-get (car auth) :secret))))))) +;; (setq znc-servers +;; `(("znc.shemshak.org" 1337 t +;; ((freenode "amin/freenode" ,pwd))) +;; ("znc.shemshak.org" 1337 t +;; ((moznet "amin/moznet" ,pwd))) +;; ("znc.shemshak.org" 1337 t +;; ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization -- 2.20.1