commit 124ad4529a8892720a33b2a8c9f3f621a6d29f48 parent 372142d90c2cd407fd8360f07e5487756038192b Author: Vincent Demeester <vincent@sbr.pm> Date: Thu, 9 Apr 2020 18:05:38 +0200 emacs: add comments and provide keyword Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
31 files changed, 185 insertions(+), 74 deletions(-)
diff --git a/tools/emacs/config/00-clean.el b/tools/emacs/config/00-clean.el @@ -1,3 +1,7 @@ +;;; 00-clean.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; No littering and recentf configuration +;;; Code: (use-package recentf :config (setq recentf-max-saved-items 200 @@ -54,3 +58,4 @@ `((".*" . ,(no-littering-expand-var-file-name "backup/"))) auto-save-file-name-transforms `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))) +;;; 00-clean.el ends here diff --git a/tools/emacs/config/00-environments.el b/tools/emacs/config/00-environments.el @@ -1,4 +1,10 @@ -(use-package exec-path-from-shell ; Set up environment variables +;;; 00-environments.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Setup environment variables for Emacs +;;; Code: + +;; We shouldn't need that, so it's disabled for now +(use-package exec-path-from-shell :disabled :if (display-graphic-p) :unless (or (eq system-type 'windows-nt) (eq system-type 'gnu/linux)) @@ -12,3 +18,5 @@ (setenv "PAGER" "cat") (setenv "TERM" "xterm-256color") + +;;; 00-environments.el ends here diff --git a/tools/emacs/config/01-server.el b/tools/emacs/config/01-server.el @@ -1,4 +1,7 @@ ;;; 01-server.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Enable server-mode +;;; Code: ;; UseServer (use-package server diff --git a/tools/emacs/config/config-appearance.el b/tools/emacs/config/config-appearance.el @@ -1,4 +1,4 @@ -;;; appearance.el --- -*- lexical-binding: t -*- +;;; config-appearance.el --- -*- lexical-binding: t -*- ;;; Commentary: ;;; Appearance configuration ;;; Code: @@ -176,4 +176,5 @@ :hook (((completion-list-mode completion-in-region-mode) . hide-mode-line-mode))) ;; -UseHideModeLine -;;; appearance.el ends here +(provide 'config-appearance) +;;; config-appearance.el ends here diff --git a/tools/emacs/config/config-buffers.el b/tools/emacs/config/config-buffers.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; config-buffers.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Buffer related configurations +;;; Code: ;; UseDisplayBuffers (use-package emacs @@ -148,4 +151,5 @@ (ibuffer-do-sort-by-filename/process))))) ;; -UseIBuffer -(provide 'setup-buffers) +(provide 'config-buffers) +;;; config-buffers.el ends here diff --git a/tools/emacs/config/config-compile.el b/tools/emacs/config/config-compile.el @@ -80,4 +80,5 @@ (flycheck-buffer-automatically 'idle-change))) ;; -UseFlycheck -(provide 'setup-compile) +(provide 'config-compile) +;;; config-compile.el ends here diff --git a/tools/emacs/config/config-completion.el b/tools/emacs/config/config-completion.el @@ -1,4 +1,4 @@ -;;; setup-completion.el --- -*- lexical-binding: t -*- +;;; config-completion.el --- -*- lexical-binding: t -*- ;;; Commentary: ;;; Setup completion framework ;;; Code @@ -108,8 +108,8 @@ instead." (setq icomplete-hide-common-prefix nil) (setq icomplete-prospects-height 1) (setq icomplete-separator " ยท ") ; mid dot, not full stop + (setq icomplete-in-buffer nil) (setq icomplete-with-completion-tables t) - (setq icomplete-in-buffer t) (fido-mode -1) ; Emacs 27.1 (icomplete-mode 1) @@ -343,4 +343,5 @@ Otherwise, use `projectile-switch-to-project'." "--ignore-file" ,(expand-file-name ".ignore" (getenv "HOME"))) "Default rg arguments used in the functions in `counsel' and `projectile' packages.") -(provide 'setup-completion) +(provide 'config-completion) +;;; config-completion.el ends here diff --git a/tools/emacs/config/config-dired.el b/tools/emacs/config/config-dired.el @@ -173,5 +173,5 @@ ("r" . dired-rsync))) ;; -UseDiredRsync -(provide 'setup-dired) +(provide 'config-dired) ;; config-dired.el ends here diff --git a/tools/emacs/config/config-editing.el b/tools/emacs/config/config-editing.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; config-editing.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Editing configuration +;;; Code: (setq-default enable-remote-dir-locals t) ;; UseSmartParens @@ -259,4 +262,5 @@ instead. This command can then be followed by the standard (pdf-tools-install :no-query) (require 'pdf-occur)) -(provide 'setup-editing) +(provide 'config-editing) +;;; config-editing.el ends here diff --git a/tools/emacs/config/config-files.el b/tools/emacs/config/config-files.el @@ -84,5 +84,5 @@ (bind-key "C-c f v r" #'vde/reload-dir-locals-for-current-buffer) (bind-key "C-c f v r" #'vde/reload-dir-locals-for-all-buffers-in-this-directory) -(provide 'setup-files) +(provide 'config-files) ;;; config-files.el ends here diff --git a/tools/emacs/config/config-keybindings.el b/tools/emacs/config/config-keybindings.el @@ -1,3 +1,7 @@ +;;; config-keybindings.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Key binding specific configuration +;;; Code: (use-package which-key :disabled :init (which-key-mode) @@ -19,4 +23,5 @@ ;; Disable C-x C-n to avoid the disabled command buffer (unbind-key "C-x C-n" global-map) -(provide 'setup-keybindings) +(provide 'config-keybindings) +;;; config-keybindings.el ends here diff --git a/tools/emacs/config/config-mails.el b/tools/emacs/config/config-mails.el @@ -1,4 +1,7 @@ -;;; setup-mails.el --- -*- lexical-binding: t -*- +;;; config-mails.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Mails configuration +;;; Code: ;; AuthSource (use-package auth-source @@ -78,5 +81,5 @@ (:key "S" :name "sent" :query "tag:Sent Mail")))))) ;; -Notmuch -(provide 'setup-mails) -;;; setup-mails ends here +(provide 'config-mails) +;;; config-mails ends here diff --git a/tools/emacs/config/config-misc.el b/tools/emacs/config/config-misc.el @@ -25,4 +25,5 @@ ("authorized_keys2?\\'" . ssh-authorized-keys-mode))) ;; -UseSSHConfig +(provide 'config-misc) ;;; config-misc.el ends here diff --git a/tools/emacs/config/config-mouse.el b/tools/emacs/config/config-mouse.el @@ -0,0 +1,19 @@ +;;; config-mouse.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Mouse configuration +;;; Code: + +(use-package mouse + :config + (setq mouse-wheel-scroll-amount + '(1 + ((shift) . 5) + ((meta) . 0.5) + ((control) . text-scale))) + (setq make-pointer-invisible t + mouse-wheel-progressive-speed t + mouse-wheel-follow-mouse t) + :hook (after-init . mouse-wheel-mode)) + +(provide 'config-mouse) +;;; config-mouse.el ends here diff --git a/tools/emacs/config/config-navigating.el b/tools/emacs/config/config-navigating.el @@ -1,3 +1,8 @@ +;;; config-navigating.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Navigation related configuration +;;; Code: + (use-package avy :disabled :bind (("C-c j" . avy-goto-word-1) @@ -21,4 +26,5 @@ ("C-a" . mwim-beginning-of-code-or-line) ("C-e" . mwim-end-of-code-or-line))) -(provide 'setup-navigating) +(provide 'config-navigating) +;;; config-navigating.el ends here diff --git a/tools/emacs/config/config-org.el b/tools/emacs/config/config-org.el @@ -1,4 +1,4 @@ -;;; setup-org.el --- -*- lexical-binding: t -*- +;;; config-org.el --- -*- lexical-binding: t -*- ;;; Commentary: ;;; Configuration of orgmode. ;;; Code: @@ -630,5 +630,5 @@ activation of `org-tree-slide-mode'." (use-package orgit :after magit) -(provide 'setup-org) -;;; setup-org.el ends here +(provide 'config-org) +;;; config-org.el ends here diff --git a/tools/emacs/config/config-projects.el b/tools/emacs/config/config-projects.el @@ -1,4 +1,8 @@ -;;; -*- lexical-binding: t; -*- +;;; config-projects.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Project related configuration. +;;; Using projectile now, might use projects later +;;; Code: (use-package projectile :commands (projectile-ack @@ -44,4 +48,5 @@ "Run `compile' in the project" (projectile-compile-project nil))) -(provide 'setup-projectile) +(provide 'config-projects) +;;; config-projects.el ends here diff --git a/tools/emacs/config/config-search.el b/tools/emacs/config/config-search.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; config-search.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Search related configuration +;;; Code: ;; UseISearch (use-package isearch @@ -112,4 +115,5 @@ confines of word boundaries (e.g. multiple words)." ([remap query-replace-regexp] . anzu-query-replace-regexp) ("M-s %" . anzu-query-replace-at-cursor)) -(provide 'setup-search) +(provide 'config-search) +;;; config-search.el ends here diff --git a/tools/emacs/config/config-shells.el b/tools/emacs/config/config-shells.el @@ -1,4 +1,8 @@ -;;; -*- lexical-binding: t; -*- +;;; config-shells.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Shell scripting +;;; Code: + (use-package shell :commands (shell) :bind (("<f1>" . shell) diff --git a/tools/emacs/config/config-vcs.el b/tools/emacs/config/config-vcs.el @@ -189,5 +189,5 @@ (kill-buffer log-buf)) (kill-buffer commit-buf))) -(provide 'setup-vcs) -;;; setup-vcs.el ends here +(provide 'config-vcs) +;;; config-vcs.el ends here diff --git a/tools/emacs/config/config-windows.el b/tools/emacs/config/config-windows.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; config-windows.el --- -*- lexical-binding: t; -*- +;; Commentary: +;;; Windows configuration +;; Code: ;; Winner (use-package winner @@ -68,4 +71,5 @@ eyebrowse-wrap-around t) (eyebrowse-mode 1)) -(provide 'setup-windows) +(provide 'config-windows) +;;; config-windows ends here diff --git a/tools/emacs/config/programming-config.el b/tools/emacs/config/programming-config.el @@ -1,3 +1,8 @@ +;;; programming-config.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Configuration files mode configuration +;;; Code: + (use-package yaml-mode :mode "\\.ya?ml\\'" :hook ((yaml-mode . highlight-indentation-mode) @@ -5,3 +10,6 @@ (use-package toml-mode :mode "\\.to?ml\\'") + +(provide 'programming-config) +;;; programming-config.el ends here diff --git a/tools/emacs/config/programming-containers.el b/tools/emacs/config/programming-containers.el @@ -0,0 +1,31 @@ +;;; programming-containers.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Containers configuration +;;; Code: +(use-package dockerfile-mode + :mode ("Dockerfile\\'" . dockerfile-mode)) + +;; I have a bunch of different 'profiles' for kubernetes by different cluster so +;; i don't mess between things +;; This allow me to set the KUBECONFIG variable between those easily +;; TODO: add the current profile in modeline +(defun my-switch-kubeconfig-env (&optional kubeconfig) + "Set KUBECONFIG environment variable for the current session" + (interactive + (list + (completing-read + "Kubeconfig: " + (mapcar + (lambda (x) + (replace-regexp-in-string + "^config\." "" + (file-name-nondirectory(directory-file-name x)))) + (directory-files-recursively + (expand-file-name "~/.kube") "^config\.")) nil t ))) + (setq kubeconfig (expand-file-name (format "~/.kube/config.%s" kubeconfig))) + (if (file-exists-p kubeconfig) + (setenv "KUBECONFIG" kubeconfig) + (error "Cannot find kubeconfig: %s" kubeconfig))) + +(provide 'programming-containers) +;;; programming-containers.el ends here diff --git a/tools/emacs/config/programming-docker.el b/tools/emacs/config/programming-docker.el @@ -1,27 +0,0 @@ -;;; -*- lexical-binding: t; -*- -(use-package dockerfile-mode - :mode ("Dockerfile\\'" . dockerfile-mode)) - -;; I have a bunch of different 'profiles' for kubernetes by different cluster so -;; i don't mess between things -;; This allow me to set the KUBECONFIG variable between those easily -;; TODO: add the current profile in modeline -(defun my-switch-kubeconfig-env (&optional kubeconfig) - "Set KUBECONFIG environment variable for the current session" - (interactive - (list - (completing-read - "Kubeconfig: " - (mapcar - (lambda (x) - (replace-regexp-in-string - "^config\." "" - (file-name-nondirectory(directory-file-name x)))) - (directory-files-recursively - (expand-file-name "~/.kube") "^config\.")) nil t ))) - (setq kubeconfig (expand-file-name (format "~/.kube/config.%s" kubeconfig))) - (if (file-exists-p kubeconfig) - (setenv "KUBECONFIG" kubeconfig) - (error "Cannot find kubeconfig: %s" kubeconfig))) - -(provide 'setup-docker) diff --git a/tools/emacs/config/programming-elisp.el b/tools/emacs/config/programming-elisp.el @@ -1,4 +1,12 @@ +;;; programming-elisp.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Emacs Lisp configurations +;;; Code: + (use-package company-elisp :after company :config (push 'company-elisp company-backends)) + +(provide 'programming-elisp) +;;; programming-elisp.el ends here diff --git a/tools/emacs/config/programming-go.el b/tools/emacs/config/programming-go.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; programming-go.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Go programming language configuration +;;; Code: (use-package go-mode :commands (go-mode) :mode "\\.go$" @@ -33,4 +36,5 @@ ("C-c t f" . gotest-ui-current-file) ("C-c t p" . gotest-ui-current-project))) -(provide 'setup-go) +(provide 'programming-go) +;;; programming-go.el ends here diff --git a/tools/emacs/config/programming-nix.el b/tools/emacs/config/programming-nix.el @@ -1,4 +1,7 @@ -;;; -*- lexical-binding: t; -*- +;;; programming-nix.el --- -*- lexical-binding: t; -*- +;;; Commentary: +;;; Nix configuration +;;; Code: (use-package nix-mode :if *nix* :mode ("\\.nix\\'" "\\.nix.in\\'")) @@ -19,4 +22,5 @@ :config (add-hook 'nix-mode-hook 'nixpkgs-fmt-on-save-mode)) -(provide 'setup-nix) +(provide 'programming-nix) +;;; programming-nix.el ends here diff --git a/tools/emacs/config/programming-web.el b/tools/emacs/config/programming-web.el @@ -1,6 +1,10 @@ +;;; programming-web.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Web related configuration +;;; Code: + (use-package web-mode - ;; :if *sys/full* - :disabled + :commands (web-mode) :mode ("\\.html\\'" . web-mode) ("\\.phtml\\'" . web-mode) @@ -37,3 +41,6 @@ :after (company css-mode) :config (push 'company-css company-backends)) + +(provide 'programming-web) +;;; programming-web.el ends here diff --git a/tools/emacs/config/setup-mouse.el b/tools/emacs/config/setup-mouse.el @@ -1,11 +0,0 @@ -(use-package mouse - :config - (setq mouse-wheel-scroll-amount - '(1 - ((shift) . 5) - ((meta) . 0.5) - ((control) . text-scale))) - (setq make-pointer-invisible t - mouse-wheel-progressive-speed t - mouse-wheel-follow-mouse t) - :hook (after-init . mouse-wheel-mode)) diff --git a/tools/emacs/config/setup-style.el b/tools/emacs/config/setup-style.el @@ -41,3 +41,4 @@ ) (provide 'setup-style) +;;; setup-style.el ends here diff --git a/tools/emacs/config/writing.el b/tools/emacs/config/writing.el @@ -1,3 +1,8 @@ +;;; writing.el --- -*- lexical-binding: t -*- +;;; Commentary: +;;; Writing modes configuration +;;; Code: + (use-package markdown-mode :mode ("\\.md\\'" . markdown-mode) :config @@ -17,3 +22,6 @@ "--standalone" "-f" "markdown" "-t" "html5") " "))) (add-hook 'markdown-mode-hook #'auto-fill-mode)) + +(provide 'writing) +;;; writing.el ends here