;;; 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))
+
\f
;;; Defaults
;;; General bindings
(bind-keys
+ ("C-a" . b/move-indentation-or-beginning-of-line)
("C-c a i" . ielm)
("C-c e b" . eval-buffer)
("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)
;; 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))
(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
\f
;;; Theme
+(comment
(add-to-list 'custom-theme-load-path
(expand-file-name
(convert-standard-filename "lisp") user-emacs-directory))
("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
(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)))
: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
projects / ~bandali / configs / blobdiff