;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2019 Amin Bandali <bandali@gnu.org>
+;; Copyright (C) 2018-2020 Amin Bandali <bandali@gnu.org>
;; 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
(interactive)
(kill-buffer (current-buffer)))
+(defun b/move-indentation-or-beginning-of-line (arg)
+ "Move to the indentation or to the beginning of line."
+ (interactive "^p")
+ ;; (if (bolp)
+ ;; (back-to-indentation)
+ ;; (move-beginning-of-line arg))
+ (if (= (point)
+ (progn (back-to-indentation)
+ (point)))
+ (move-beginning-of-line arg)))
+
+(defun b/join-line-top ()
+ "Like `join-line', but join next line to the current line."
+ (interactive)
+ (join-line 1))
+
+(defun b/duplicate-line-or-region (&optional n)
+ "Duplicate the current line, or region (if active).
+Make N (default: 1) copies of the current line or region."
+ (interactive "*p")
+ (let ((u-r-p (use-region-p)) ; if region is active
+ (n1 (or n 1)))
+ (save-excursion
+ (let ((text
+ (if u-r-p
+ (buffer-substring (region-beginning) (region-end))
+ (prog1 (thing-at-point 'line)
+ (end-of-line)
+ (if (eobp)
+ (newline)
+ (forward-line 1))))))
+ (dotimes (_ (abs n1))
+ (insert text))))))
+
\f
;;; Defaults
;; scroll-margin 1
;; scroll-conservatively 10000
scroll-step 1
- scroll-conservatively 10
+ scroll-conservatively 101
scroll-preserve-screen-position 1
;; focus follows mouse
mouse-autoselect-window t)
;;; General bindings
(bind-keys
+ ("C-a" . b/move-indentation-or-beginning-of-line)
("C-c a i" . ielm)
+ ("C-c d" . b/duplicate-line-or-region)
("C-c e b" . eval-buffer)
("C-c e e" . eval-last-sexp)
("C-S-h C" . describe-char)
("C-S-h F" . describe-face)
+ ("C-S-j" . b/join-line-top)
+
("C-c x" . execute-extended-command)
("C-x k" . b/kill-current-buffer)
(require 'bandali-org)
+(require 'bandali-theme)
+
;; *the* right way to do git
(use-package magit
:bind (("C-x g" . magit-status)
(require 'bandali-ivy)
(require 'bandali-eshell)
+;; (require 'bandali-multi-term)
(require 'bandali-ibuffer)
("H" . outline-hide-body)
("S" . outline-show-all)
("h" . outline-hide-subtree)
- ("s" . outline-show-subtree)))
+ ("s" . outline-show-subtree))
+ :config
+ (when (featurep 'which-key)
+ (which-key-add-key-based-replacements
+ "C-c @" "outline"
+ "s-O" "outline")))
(use-package ls-lisp
:custom (ls-lisp-dirs-first t))
(require 'bandali-message)
(require 'bandali-ebdb)
+;; IRC (with ERC and ZNC)
+(require 'bandali-erc)
+
+(use-package scpaste
+ :config
+ (setq scpaste-http-destination "https://p.bndl.org"
+ scpaste-scp-destination "p:~"))
+
\f
;;; Editing
-(comment
+
;; highlight uncommitted changes in the left fringe
(use-package diff-hl
:defer 0.6
:config
(setq diff-hl-draw-borders nil)
(global-diff-hl-mode)
- :hook (magit-post-refresh . diff-hl-magit-post-refresh))
+ :hook
+ ((magit-pre-refresh . diff-hl-magit-pre-refresh)
+ (magit-post-refresh . diff-hl-magit-post-refresh)))
;; display Lisp objects at point in the echo area
(use-package eldoc
(use-package conf-mode
:mode "\\.*rc$")
-(use-package sh-mode
- :mode "\\.bashrc$")
+(use-package sh-script
+ :mode ("\\.bashrc$" . sh-mode))
(use-package company
:disabled
)
(use-package flycheck
+ :disabled
:defer 0.6
:hook (prog-mode . flycheck-mode)
:bind
(setq flycheck-check-syntax-automatically '(mode-enabled save))
:custom (flycheck-mode-line-prefix "flyc"))
-(use-package flyspell)
+;; (use-package flyspell)
;; http://endlessparentheses.com/ispell-and-apostrophes.html
(use-package ispell
+ :disabled
:defer 0.6
:config
;; ’ can be part of a word
(setq indent-tabs-mode nil))
(add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
-(use-package reveal
- :hook (emacs-lisp-mode . reveal-mode))
-
-(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 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 lean-mode
+ :disabled
:defer 0.4
+ :init (eval-when-compile (defvar lean-mode-map))
:bind (:map lean-mode-map
("S-SPC" . company-complete))
:config
lean-input-user-translations '(("/" "/")))
(lean-input-setup))
-(use-package mhtml-mode)
-
(use-package sgml-mode
:config
(setq sgml-basic-offset 0))
:config
(setq css-indent-offset 2))
-(use-package emmet-mode
- :after (:any mhtml-mode css-mode sgml-mode)
- :bind* (("C-)" . emmet-next-edit-point)
- ("C-(" . emmet-prev-edit-point))
- :config
- (unbind-key "C-j" emmet-mode-keymap)
- (setq emmet-move-cursor-between-quotes t)
- :hook (css-mode html-mode sgml-mode))
-
-(use-package geiser)
+(use-package geiser
+ :disabled)
(use-package geiser-guile
+ :disabled
:config
(setq geiser-guile-load-path "~/src/git/guix"))
-(use-package guix)
-
-(comment
- (use-package auctex
- :custom
- (font-latex-fontify-sectioning 'color)))
+(use-package guix
+ :disabled)
(use-package go-mode
:disabled)
(use-package po-mode
+ :disabled
:hook
(po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
+(use-package auctex
+ :disabled
+ :custom
+ (font-latex-fontify-sectioning 'color))
+
(use-package tex-mode
:config
(cl-delete-if
;; :mode "\\.grg\\'")
\f
-;;; Theme
-
-(add-to-list 'custom-theme-load-path
- (expand-file-name
- (convert-standard-filename "lisp") user-emacs-directory))
-(load-theme 'tangomod t)
-
-(use-package smart-mode-line
- :commands (sml/apply-theme)
- :demand
- :config
- ;; thanks, but no thnaks; don't make fixed-width fills.
- (defun sml/fill-for-buffer-identification () "")
- (setq sml/theme 'tangomod)
- (sml/setup)
- (smart-mode-line-enable))
-
-(use-package doom-modeline
- :disabled
- :demand
- :hook (after-init . doom-modeline-init)
- :custom
- (doom-modeline-buffer-file-name-style 'relative-to-project))
-
-(use-package doom-themes)
-
-(use-package moody
- :disabled
- :demand
- :config
- (setq x-underline-at-descent-line t)
- (let ((line (face-attribute 'mode-line :underline)))
- (set-face-attribute 'mode-line nil :overline line)
- (set-face-attribute 'mode-line-inactive nil :overline line)
- (set-face-attribute 'mode-line-inactive nil :underline line)
- (set-face-attribute 'mode-line nil :box nil)
- (set-face-attribute 'mode-line-inactive nil :box nil)
- (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
- (moody-replace-mode-line-buffer-identification)
- (moody-replace-vc-mode))
-
-(use-package mini-modeline
- :disabled
- :demand
- :config (mini-modeline-mode))
-
-(defvar b/org-mode-font-lock-keywords
- '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
- (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
- (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
- (4 '(:foreground "#c5c8c6") t))) ; title
- "For use with the `doom-tomorrow-night' theme.")
-
-(defun b/lights-on ()
- "Enable my favourite light theme."
- (interactive)
- (mapc #'disable-theme custom-enabled-themes)
- (load-theme 'tangomod t)
- (when (featurep 'smart-mode-line)
- (sml/apply-theme 'tangomod))
- (font-lock-remove-keywords
- 'org-mode b/org-mode-font-lock-keywords)
- (when (featurep 'erc-hl-nicks)
- (erc-hl-nicks-reset-face-table))
- (when (featurep 'exwm-systemtray)
- (exwm-systemtray--refresh)))
-
-(defun b/lights-off ()
- "Go dark."
- (interactive)
- (mapc #'disable-theme custom-enabled-themes)
- (load-theme 'doom-one t)
- (when (featurep 'smart-mode-line)
- (sml/apply-theme 'automatic))
- (font-lock-add-keywords
- 'org-mode b/org-mode-font-lock-keywords t)
- (when (featurep 'erc-hl-nicks)
- (erc-hl-nicks-reset-face-table))
- (when (featurep 'exwm-systemtray)
- (exwm-systemtray--refresh)))
-
-(bind-keys
- ("C-c t d" . b/lights-off)
- ("C-c t l" . b/lights-on))
-
-\f
;;; Emacs enhancements & auxiliary packages
(use-package man
:config
(which-key-add-key-based-replacements
;; prefixes for global prefixes and minor modes
- "C-c @" "outline"
"C-c !" "flycheck"
"C-x RET" "coding system"
"C-x 8" "unicode"
"C-c F" "frames"
"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 q" "boxquote"
- "C-c t" "themes"
- ;; "s-O" "outline"
- )
+ "C-c t" "themes")
;; prefixes for major modes
(which-key-add-major-mode-key-based-replacements 'message-mode
(which-key-mode)
:custom
(which-key-add-column-padding 5)
- (which-key-max-description-length 32))
+ (which-key-idle-delay 10000)
+ (which-key-idle-secondary-delay 0.05)
+ (which-key-max-description-length 32)
+ (which-key-show-early-on-C-h t))
-(use-package crux ; results in Waiting for git... [2 times]
- :defer 0.4
- :bind (("C-c d" . crux-duplicate-current-line-or-region)
- ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region)
- ("C-c f C" . crux-copy-file-preserve-attributes)
- ("C-c f D" . crux-delete-file-and-buffer)
- ("C-c f R" . crux-rename-file-and-buffer)
- ("C-c j" . crux-top-join-line)
- ("C-S-j" . crux-top-join-line)))
-
-(use-package mwim
- :bind (("C-a" . mwim-beginning-of-code-or-line)
- ("C-e" . mwim-end-of-code-or-line)
- ("<home>" . mwim-beginning-of-line-or-code)
- ("<end>" . mwim-end-of-line-or-code)))
-
-(use-package projectile
- :disabled
- :defer 0.5
- :bind-keymap ("C-c p" . projectile-command-map)
- :config
- (projectile-mode)
-
- (defun b/projectile-mode-line-fun ()
- "Report project name and type in the modeline."
- (let ((project-name (projectile-project-name))
- (project-type (projectile-project-type)))
- (format "%s%s"
- projectile-mode-line-prefix
- (if project-type
- (format ":%s" project-type)
- ""))))
- (setq projectile-mode-line-function 'b/projectile-mode-line-fun)
-
- (defun my-projectile-invalidate-cache (&rest _args)
- ;; ignore the args to `magit-checkout'
- (projectile-invalidate-cache nil))
-
- (eval-after-load 'magit-branch
- '(progn
- (advice-add 'magit-checkout
- :after #'my-projectile-invalidate-cache)
- (advice-add 'magit-branch-and-checkout
- :after #'my-projectile-invalidate-cache)))
- :custom
- (projectile-completion-system 'ivy)
- (projectile-mode-line-prefix " proj"))
+;; (require 'bandali-projectile)
(use-package helpful
+ :disabled
:defer 0.6
:bind
(("C-S-h c" . helpful-command)
(use-package boxquote
:defer 0.6
:bind
- (:prefix-map b/boxquote-prefix-map
- :prefix "C-c q"
- ("b" . boxquote-buffer)
- ("B" . boxquote-insert-buffer)
- ("d" . boxquote-defun)
- ("F" . boxquote-insert-file)
- ("hf" . boxquote-describe-function)
- ("hk" . boxquote-describe-key)
- ("hv" . boxquote-describe-variable)
- ("hw" . boxquote-where-is)
- ("k" . boxquote-kill)
- ("p" . boxquote-paragraph)
- ("q" . boxquote-boxquote)
- ("r" . boxquote-region)
- ("s" . boxquote-shell-command)
- ("t" . boxquote-text)
- ("T" . boxquote-title)
- ("u" . boxquote-unbox)
- ("U" . boxquote-unbox-region)
- ("y" . boxquote-yank)
- ("M-q" . boxquote-fill-paragraph)
- ("M-w" . boxquote-kill-ring-save)))
-
-(use-package orgalist
- ;; breaks auto-fill-mode, showing this error:
- ;; orgalist--boundaries: Lisp nesting exceeds ‘max-lisp-eval-depth’
- :disabled
- :after message
- :hook (message-mode . orgalist-mode))
+ (:prefix-map
+ b/boxquote-prefix-map
+ :prefix "C-c q"
+ ("b" . boxquote-buffer)
+ ("B" . boxquote-insert-buffer)
+ ("d" . boxquote-defun)
+ ("F" . boxquote-insert-file)
+ ("hf" . boxquote-describe-function)
+ ("hk" . boxquote-describe-key)
+ ("hv" . boxquote-describe-variable)
+ ("hw" . boxquote-where-is)
+ ("k" . boxquote-kill)
+ ("p" . boxquote-paragraph)
+ ("q" . boxquote-boxquote)
+ ("r" . boxquote-region)
+ ("s" . boxquote-shell-command)
+ ("t" . boxquote-text)
+ ("T" . boxquote-title)
+ ("u" . boxquote-unbox)
+ ("U" . boxquote-unbox-region)
+ ("y" . boxquote-yank)
+ ("M-q" . boxquote-fill-paragraph)
+ ("M-w" . boxquote-kill-ring-save)))
-;; highlight TODOs in buffers
(use-package hl-todo
+ ;; highlight TODOs in buffers
:defer 0.5
:config
(global-hl-todo-mode))
-(use-package multi-term
- :disabled
- :defer 0.6
- :bind (("C-c a s m m" . multi-term)
- ("C-c a s m d" . multi-term-dedicated-toggle)
- ("C-c a s m p" . multi-term-prev)
- ("C-c a s m n" . multi-term-next)
- :map term-mode-map
- ("C-c C-j" . term-char-mode))
- :config
- (setq multi-term-program "screen"
- multi-term-program-switches (concat "-c"
- (getenv "XDG_CONFIG_HOME")
- "/screen/screenrc")
- ;; TODO: add separate bindings for connecting to existing
- ;; session vs. always creating a new one
- multi-term-dedicated-select-after-open-p t
- multi-term-dedicated-window-height 20
- multi-term-dedicated-max-window-height 30
- term-bind-key-alist
- '(("C-c C-c" . term-interrupt-subjob)
- ("C-c C-e" . term-send-esc)
- ("C-c C-j" . term-line-mode)
- ("C-k" . kill-line)
- ;; ("C-y" . term-paste)
- ("C-y" . term-send-raw)
- ("M-f" . term-send-forward-word)
- ("M-b" . term-send-backward-word)
- ("M-p" . term-send-up)
- ("M-n" . term-send-down)
- ("M-j" . term-send-raw-meta)
- ("M-y" . term-send-raw-meta)
- ("M-/" . term-send-raw-meta)
- ("M-0" . term-send-raw-meta)
- ("M-1" . term-send-raw-meta)
- ("M-2" . term-send-raw-meta)
- ("M-3" . term-send-raw-meta)
- ("M-4" . term-send-raw-meta)
- ("M-5" . term-send-raw-meta)
- ("M-6" . term-send-raw-meta)
- ("M-7" . term-send-raw-meta)
- ("M-8" . term-send-raw-meta)
- ("M-9" . term-send-raw-meta)
- ("<C-backspace>" . term-send-backward-kill-word)
- ("<M-DEL>" . term-send-backward-kill-word)
- ("M-d" . term-send-delete-word)
- ("M-," . term-send-raw)
- ("M-." . comint-dynamic-complete))
- term-unbind-key-alist
- '("C-z" "C-x" "C-c" "C-h"
- ;; "C-y"
- "<ESC>")))
-
(use-package page-break-lines
:defer 0.5
:custom
(use-package expand-region
:bind ("C-=" . er/expand-region))
-(use-package multiple-cursors
- :bind
- (("C-S-<mouse-1>" . mc/add-cursor-on-click)
- (:prefix-map b/mc-prefix-map
- :prefix "C-c m"
- ("c" . mc/edit-lines)
- ("n" . mc/mark-next-like-this)
- ("p" . mc/mark-previous-like-this)
- ("a" . mc/mark-all-like-this))))
-
-(use-package yasnippet
- :defer 0.6
- :config
- (defconst yas-verbosity-cur yas-verbosity)
- (setq yas-verbosity 2)
- (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
- (yas-reload-all)
- (setq yas-verbosity yas-verbosity-cur)
-
- (defun b/yas--maybe-expand-key-filter (cmd)
- (when (and (yas--maybe-expand-key-filter cmd)
- (not (bound-and-true-p git-commit-mode)))
- cmd))
- (defconst b/yas-maybe-expand
- '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter))
- (define-key yas-minor-mode-map
- (kbd "SPC") b/yas-maybe-expand)
-
- (yas-global-mode))
+(require 'bandali-yasnippet)
+
+(comment
(use-package debbugs
:bind
(use-package window
:bind
- (("C-c w e" . (lambda ()
- (interactive)
- (split-window-right)
- (other-window 1)
- (erc-switch-to-buffer)))
- ("C-c w s l" . (lambda ()
+ (("C-c w s l" . (lambda ()
(interactive)
(split-window-right)
(other-window 1)))
(goto-char (cdr macro)))
(reftex-this-word)))))
-(use-package minions
- :demand
- :config (minions-mode))
-
(use-package dmenu
:custom
(dmenu-prompt-string "run: ")
:config
(eosd-start))
-(use-package scpaste
- :disabled
- :config
- (setq scpaste-http-destination "https://p.bndl.org"
- scpaste-scp-destination "nix:/var/www/p.bndl.org"))
-
(use-package eww
:bind ("C-c a e w" . eww)
:custom
(getenv "XDG_DOWNLOAD_DIR"))))
\f
-;;; IRC (with ERC and ZNC)
-
-(use-package erc
- :bind (("C-c b b" . erc-switch-to-buffer)
- :map erc-mode-map
- ("M-a" . erc-track-switch-buffer))
- :custom
- (erc-join-buffer 'bury)
- (erc-lurker-hide-list '("JOIN" "PART" "QUIT"))
- (erc-nick "bandali")
- (erc-prompt "erc>")
- (erc-rename-buffers t)
- (erc-server-reconnect-attempts 5)
- (erc-server-reconnect-timeout 3)
- :config
- (defun erc-cmd-OPME ()
- "Request chanserv to op me."
- (erc-message "PRIVMSG"
- (format "chanserv op %s %s"
- (erc-default-target)
- (erc-current-nick)) nil))
- (defun erc-cmd-DEOPME ()
- "Deop myself from current channel."
- (erc-cmd-DEOP (format "%s" (erc-current-nick))))
- (add-to-list 'erc-modules 'keep-place)
- (add-to-list 'erc-modules 'notifications)
- (add-to-list 'erc-modules 'smiley)
- (add-to-list 'erc-modules 'spelling)
- (add-to-list 'erc-modules 'scrolltoplace)
- (erc-update-modules))
-
-(use-package erc-fill
- :after erc
- :custom
- (erc-fill-column 77)
- (erc-fill-function 'erc-fill-static)
- (erc-fill-static-center 18))
-
-(use-package erc-pcomplete
- :after erc
- :custom
- (erc-pcomplete-nick-postfix ", "))
-
-(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))
- :custom
- (erc-track-enable-keybindings nil)
- (erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
- "324" "329" "332" "333" "353" "477"))
- (erc-track-position-in-mode-line t)
- (erc-track-priority-faces-only 'all)
- (erc-track-shorten-function nil))
-
-(use-package erc-hl-nicks
- :after erc)
-
-(use-package erc-scrolltoplace
- :after erc)
-
-(use-package znc
- :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
- ((oftc "amin/oftc" ,pwd)))))))
-
-\f
;;; Post initialization
)
projects / ~bandali / configs / blobdiff