From 5ceca9a6ab337a323cbab13f85c61ec5ad9c6950 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 2 Nov 2019 13:19:42 +0100 Subject: [PATCH] Emacs: Remove package-selected-packages and useless section comments. I use Guix to manage my Emacs packages. --- .emacs.d/init.el | 157 ++---------------------------------------- .emacs.d/lisp/main.el | 4 ++ 2 files changed, 10 insertions(+), 151 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 20af4ed2..102dc836 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -79,124 +79,67 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Assembly -(push 'nasm-mode package-selected-packages) - -;;; Asymptote (add-to-list 'load-path "/usr/share/asymptote") (autoload 'asy-mode "asy-mode" "Asymptote major mode." t) (autoload 'lasy-mode "asy-mode" "Hybrid Asymptote/Latex major mode." t) (autoload 'asy-insinuate-latex "asy-mode" "Asymptote insinuate LaTeX." t) (add-to-list 'auto-mode-alist '("\\.asy$" . asy-mode)) -;;; BBCode -(nconc package-selected-packages '(bbcode-mode)) (with-eval-after-load 'bbcode-mode (require 'init-bbcode)) -;;; Bibtex (setq bibtex-entry-format '(opts-or-alts required-fields numerical-fields whitespace realign last-comma delimiters braces sort-fields)) (setq bibtex-field-delimiters 'double-quotes) (add-hook 'bibtex-mode-hook 'ambrevar/turn-off-indent-tabs) -;;; Bison/Flex -;; (nconc package-selected-packages '(bison-mode)) - -;;; C/C++ ;; TODO: Fix gtk-look to support in-buffer documentation display with eww ;; instead of just with w3m. -(nconc package-selected-packages '(clang-format gtk-look w3m)) (with-eval-after-load 'cc-mode (require 'init-cc)) -;;; ChangeLog -(defun ambrevar/change-log-set-indent-rules () - (setq tab-width 2 left-margin 2)) -(add-hook 'change-log-mode-hook 'ambrevar/change-log-set-indent-rules) - -;;; Completion -(nconc package-selected-packages '(company helm-company slime-company)) (when (require 'company nil t) (setq company-idle-delay nil)) -;;; Debbugs -(nconc package-selected-packages '(debbugs)) (with-eval-after-load 'debbugs (setq debbugs-gnu-all-severities t)) -;;; Diff ;;; TODO: In diff-mode, both `[[` and `C-M-a` do not go back to previous index ;;; once they are at the beginning of an index. -(nconc package-selected-packages '(ztree)) -;;; Dired ;; dired-du is mostly superseeded by disk-usage.el ;; See https://github.com/calancha/dired-du/issues/2. -;; (nconc package-selected-packages '(dired-du)) -(nconc package-selected-packages '(disk-usage)) ;;; Dired is loaded after init.el, so configure it only then. (with-eval-after-load 'dired (require 'init-dired)) -;;; Daemons. -(nconc package-selected-packages '(daemons)) - -;;; Emms -(nconc package-selected-packages '(emms helm-emms)) (with-eval-after-load 'emms (require 'init-emms)) -;;; Engine -(nconc package-selected-packages '(engine-mode)) (when (require 'engine-mode nil t) (require 'init-engine)) -;;; Evil -(nconc package-selected-packages '(evil - evil-commentary evil-multiedit - evil-magit evil-org evil-collection)) (setq evil-want-keybinding nil evil-want-integration t) (when (require 'evil nil t) (require 'init-evil)) -;;; Eshell -;;; Extend completion. -(nconc package-selected-packages '(fish-completion bash-completion - pcomplete-extension pcmpl-args pcmpl-git)) -(nconc package-selected-packages '(esh-autosuggest)) (with-eval-after-load 'eshell (require 'init-eshell)) (autoload 'helm-eshell-switch "eshell") -;;; Eww (with-eval-after-load 'eww (require 'init-eww)) (autoload 'helm-eww-switch "eww") -;;; Expand region. -(nconc package-selected-packages '(expand-region)) (when (require 'expand-region nil t) (global-set-key (kbd "C-=") 'er/expand-region)) -;;; GLSL -(nconc package-selected-packages '(glsl-mode)) - -;;; Go -(nconc package-selected-packages '(go-mode go-eldoc go-guru go-rename helm-go-package company-go)) (with-eval-after-load 'go-mode (require 'init-go)) -;;; Graphviz dot -;;; The view command is broken but the preview command works (it displays the PNG -;;; in a new window), which is enough and probably not worth a fix. -(nconc package-selected-packages '(graphviz-dot-mode)) +;;; Graphviz-dot-mode: The view command is broken but the preview command works +;;; (it displays the PNG in a new window), which is enough and probably not +;;; worth a fix. -;;; GUD (GDB, etc.) -(with-eval-after-load 'gud (require 'init-gud)) +(with-eval-after-load 'gud (require 'init-gud)) ; Also GDB. -;;; Guix (when (executable-find "guix") - (nconc package-selected-packages '(guix)) (require 'init-guix)) -;;; Helm -(nconc package-selected-packages '(helm helm-descbinds helm-ls-git)) (when (require 'helm-config nil t) (require 'init-helm)) -(nconc package-selected-packages '(helpful)) (when (require 'helpful nil t) (global-set-key (kbd "C-h f") #'helpful-callable) (global-set-key (kbd "C-h v") #'helpful-variable) @@ -204,19 +147,12 @@ (global-set-key (kbd "C-h F") #'helpful-function) (global-set-key (kbd "C-h c") #'helpful-key)) -;;; Hex editing -(nconc package-selected-packages '(nhexl-mode)) - -;;; Highlight -(nconc package-selected-packages '(hl-todo)) (when (require 'hl-todo nil t) (add-to-list 'hl-todo-keyword-faces `("REVIEW" . ,(alist-get "TODO" hl-todo-keyword-faces nil nil 'equal))) (global-hl-todo-mode) ;; (global-set-key (kbd "M-s M-o") 'hl-todo-occur) (define-key hl-todo-mode-map (kbd "M-s t") 'hl-todo-occur)) -;;; Iedit -(nconc package-selected-packages '(iedit)) (when (require 'iedit nil t) (global-set-key (kbd "C-;") 'iedit-mode)) @@ -234,7 +170,6 @@ ;;; https://github.com/mhayashi1120/Emacs-imagex/issues/10 ;;; TODO: Image+: Restore animation state ;;; https://github.com/mhayashi1120/Emacs-imagex/issues/9 -(nconc package-selected-packages '(image+)) (with-eval-after-load 'image (setq image-animate-loop t) (add-hook 'image-mode-hook 'image-toggle-animation) @@ -243,11 +178,6 @@ ;;; Indentation engine fix. ;; (require 'smiext "init-smiext") -;;; Indentation style guessing. -;; (nconc 'package-selected-packages '(dtrt-indent)) - -;;; Info-colors -;; (nconc 'package-selected-packages '(info-colors)) (when (require 'info-colors nil t) (add-hook 'Info-selection-hook 'info-colors-fontify-node)) (with-eval-after-load 'helm @@ -257,17 +187,11 @@ (with-current-buffer b (derived-mode-p 'Info-mode))) (lambda (&optional candidate) - (info nil (when candidate (format "*info*<%s>" candidate)))))) -(global-set-key (kbd "C-h i") 'helm-info-switch) + (info nil (when candidate (format "*info*<%s>" candidate))))) + (global-set-key (kbd "C-h i") 'helm-info-switch)) -;;; IRC -(nconc package-selected-packages '(circe)) - -;;; JavaScript (add-hook 'js-mode-hook (lambda () (defvaralias 'js-indent-level 'tab-width))) -;;; Lisp -(nconc package-selected-packages '(lispy lispyville rainbow-delimiters geiser slime)) (with-eval-after-load 'lisp-mode (require 'init-lisp)) (with-eval-after-load 'scheme (require 'init-scheme)) (with-eval-after-load 'racket-mode (require 'init-racket)) @@ -285,13 +209,9 @@ ;; Do not use `recompile' since we want to change the compilation folder for the current buffer. "" (lambda () (interactive) (async-byte-recompile-directory (file-name-directory (buffer-file-name))))) -;;; Lua -(nconc package-selected-packages '(lua-mode)) (with-eval-after-load 'lua-mode (require 'init-lua)) -;;; Magit ;;; Magit can be loaded just-in-time. -(nconc package-selected-packages '(magit magit-todos orgit)) (with-eval-after-load 'magit (setq auto-revert-mode-text "") (set-face-foreground 'magit-branch-remote "orange red") @@ -314,11 +234,6 @@ (setq orgit-store-repository-id t)) ;;; Mail -;;; mu4e is usually site-local and not part of ELPA. -;; (when (or (fboundp 'mu4e) -;; (delq nil (mapcar (lambda (path) (string-match "/mu4e/\\|/mu4e$" path)) load-path))) -;; ;; (nconc package-selected-packages '(mu4e-maildirs-extension)) -;; (nconc package-selected-packages '(helm-mu))) ;; (with-eval-after-load 'mu4e ;; ;; mu4e-conversation must be enabled here. ;; ;; REVIEW: https://github.com/djcb/mu/issues/1258 @@ -338,64 +253,43 @@ ;; (require 'init-mu4e)) ;; (autoload 'helm-mu4e-switch "mu4e") -(nconc package-selected-packages '(helm-notmuch)) (with-eval-after-load 'notmuch (require 'init-notmuch)) (autoload 'helm-notmuch-switch "notmuch") -;;; Makefile (with-eval-after-load 'make-mode (require 'init-makefile)) -;;; Markdown -(nconc package-selected-packages '(markdown-mode)) (with-eval-after-load 'markdown-mode (require 'init-markdown)) -;;; Matlab / Octave ;; (add-to-list 'auto-mode-alist '("\\.m\\'" . octave-mode)) ; matlab, but conflicts with obj-c. (defun ambrevar/octave-set-comment-start () "Set comment character to '%' to be Matlab-compatible." (set (make-local-variable 'comment-start) "% ")) (add-hook 'octave-mode-hook 'ambrevar/octave-set-comment-start) -;;; Maxima (autoload 'maxima-mode "maxima" "Maxima mode" t) (autoload 'maxima "maxima" "Maxima interaction" t) (add-to-list 'auto-mode-alist '("\\.mac" . maxima-mode)) -;;; Mediawiki -(nconc package-selected-packages '(mediawiki)) (add-to-list 'auto-mode-alist '("\\.wiki\\'" . mediawiki-mode)) (with-eval-after-load 'mediawiki (require 'init-mediawiki)) -;;; News -(nconc package-selected-packages '(elfeed hackernews)) (with-eval-after-load 'elfeed (require 'init-elfeed)) (autoload 'helm-elfeed-switch "elfeed") -;;; Org-mode -(nconc package-selected-packages '(org-plus-contrib org-bullets helm-org-contacts)) ; org-plus contains latest Org mode. (with-eval-after-load 'org (require 'init-org)) (autoload 'helm-org-switch "org") -;;; Packaging -(nconc package-selected-packages '(esup package-lint)) - -;;; Pass -(nconc package-selected-packages '(helm-pass)) - -;;; PDF ;;; pdf-tools requires poppler built with cairo support. ;;; We cannot defer loading as `pdf-tools-install' is required for PDF ;;; association. ;;; REVIEW: `save-place' does not seem to work with pdf-tools. ;;; See https://github.com/politza/pdf-tools/issues/18. -(nconc package-selected-packages '(pdf-tools)) (when (require 'pdf-tools nil t) ;; (setq pdf-view-midnight-colors '("#ffffff" . "#000000")) (setq pdf-view-midnight-colors '("#ff9900" . "#0a0a12" )) ; Amber (add-hook 'pdf-view-mode-hook 'pdf-view-midnight-minor-mode) (pdf-tools-install t t t)) -;;; Perl (defun ambrevar/perl-set-indent-rules () (defvaralias 'perl-indent-level 'tab-width)) (defun ambrevar/perl-set-compiler () @@ -403,17 +297,8 @@ (add-hook 'perl-mode-hook 'ambrevar/perl-set-indent-rules) (add-hook 'perl-mode-hook 'ambrevar/perl-set-compiler) -;;; Pinentry -(nconc package-selected-packages '(pinentry)) ; pinentry.el was remombed from Emacs 26. - -;;; po -(nconc package-selected-packages '(po-mode)) - -;;; Python (with-eval-after-load 'python (require 'init-python)) -;;; Rainbow-mode -(nconc package-selected-packages '(rainbow-mode)) (when (require 'rainbow-mode nil t) (dolist (hook '(css-mode-hook html-mode-hook sass-mode-hook)) (add-hook hook 'rainbow-mode))) @@ -422,13 +307,11 @@ (with-eval-after-load 'nroff-mode (require 'init-nroff)) ;;; Screencast -;; (nconc package-selected-packages '(camcorder)) (with-eval-after-load 'camcorder (setq camcorder-output-directory (expand-file-name "temp" "~") camcorder-gif-output-directory camcorder-output-directory) (setq camcorder-recording-command '("recordmydesktop" " --fps 10 --no-sound --windowid " window-id " -o " file)) (add-to-list 'camcorder-gif-conversion-commands '("ffmpeg-slow" "ffmpeg -i " input-file " -vf 'fps=10,scale=1024:-1:flags=lanczos' " gif-file))) -(nconc package-selected-packages '(gif-screencast keycast)) (with-eval-after-load 'gif-screencast (define-key gif-screencast-mode-map (kbd "") 'gif-screencast-toggle-pause) (define-key gif-screencast-mode-map (kbd "") 'gif-screencast-stop)) @@ -443,41 +326,22 @@ (add-to-list 'auto-mode-alist '("package\\.accept_keywords" . sh-mode)) (add-to-list 'auto-mode-alist '("package\\.mask" . sh-mode)) (add-to-list 'auto-mode-alist '("package\\.use" . sh-mode)) -;;; If we ever need to edit exotic shell configs: -;; (nconc package-selected-packages '(fish-mode rc-mode)) ;;; Srt (subtitles) (add-to-list 'auto-mode-alist '("\\.srt\\'" . text-mode)) -;;; StackExchange -(nconc package-selected-packages '(sx)) - -(nconc package-selected-packages '(strace-mode)) - -(nconc package-selected-packages '(synosaurus)) - -;;; Syntax checking -(nconc package-selected-packages '(flycheck helm-flycheck)) -(when (require 'flycheck nil t) (require 'init-flycheck)) - ;;; System packages -(nconc package-selected-packages '(helm-system-packages)) (global-set-key (kbd "C-x c #") 'helm-system-packages) -;;; Terminal (with-eval-after-load 'term ;; (require 'init-term) (setq term-buffer-maximum-size 0)) -;;; TeX / LaTeX / Texinfo -(nconc package-selected-packages '(auctex latex-math-preview)) (with-eval-after-load 'tex (require 'init-tex)) ;; LaTeX is defined in the same file as TeX. To separate the loading, we add it ;; to the hook. (add-hook 'latex-mode-hook (lambda () (require 'init-latex))) -;;; Torrent -(nconc package-selected-packages '(transmission)) (with-eval-after-load 'transmission ;; `transmission' will fail to start and will not run any hook if the daemon ;; is not up yet. @@ -494,7 +358,6 @@ transmission-refresh-interval 1)) ;;; Translator -(nconc package-selected-packages '(google-translate)) (when (require 'google-translate nil t) (require 'google-translate-default-ui) ;; (global-set-key "\C-ct" 'google-translate-at-point) @@ -528,15 +391,11 @@ (auto-fill-mode -1)) (add-to-list 'auto-mode-alist `(,(concat (getenv "BROWSER") "-editor-*") . ambrevar/browser-edit)) -;;; Wgrep -(nconc package-selected-packages '(wgrep-helm wgrep-pt)) (when (require 'wgrep nil t) ;; TODO: wgrep-face is not so pretty. (set-face-attribute 'wgrep-face nil :inherit 'ediff-current-diff-C :foreground 'unspecified :background 'unspecified :box nil)) ;;; Window manager -(nconc package-selected-packages '(exwm helm-exwm)) -(nconc package-selected-packages '(pulseaudio-control)) (with-eval-after-load 'pulseaudio-control (setq pulseaudio-control-use-default-sink t pulseaudio-control-volume-step "2%")) @@ -555,10 +414,6 @@ ;;; Because XML is hard to read. (add-hook 'nxml-mode-hook 'ambrevar/turn-on-tab-width-to-4) -;;; Yasnippet -(nconc package-selected-packages '(yasnippet)) - -(nconc package-selected-packages '(youtube-dl)) (with-eval-after-load 'youtube-dl (setq youtube-dl-directory "~/temp")) diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el index 90f43df7..e8e7dc0e 100644 --- a/.emacs.d/lisp/main.el +++ b/.emacs.d/lisp/main.el @@ -424,4 +424,8 @@ (when (require 'so-long nil 'noerror) (global-so-long-mode 1)) +(defun ambrevar/change-log-set-indent-rules () + (setq tab-width 2 left-margin 2)) +(add-hook 'change-log-mode-hook 'ambrevar/change-log-set-indent-rules) + (provide 'main)