Small cleanup

[~bandali/configs] / init.el

diff --git a/init.el b/init.el
index 98a3842..cb1a89b 100644 (file)
--- a/init.el
+++ b/init.el
@@ -1,6 +1,6 @@
 ;;; 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
@@ -250,6 +250,11 @@ For disabling the behaviour for certain buffers and/or modes."
                 (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
 
@@ -523,6 +528,8 @@ For disabling the behaviour for certain buffers and/or modes."
  ("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)
@@ -666,6 +673,11 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; 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
 
@@ -807,11 +819,6 @@ For disabling the behaviour for certain buffers and/or modes."
     (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
   :mode "\\.\\(als\\|dsh\\)\\'"
   :config
@@ -831,10 +838,10 @@ For disabling the behaviour for certain buffers and/or modes."
               ("TAB" . indent-for-tab-command))
   :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
 
-(comment
-(eval-when-compile (defvar lean-mode-map))
 (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
@@ -846,8 +853,6 @@ For disabling the behaviour for certain buffers and/or modes."
         lean-input-user-translations '(("/" "/")))
   (lean-input-setup))
 
-;; (use-package mhtml-mode)
-
 (use-package sgml-mode
   :config
   (setq sgml-basic-offset 0))
@@ -865,26 +870,30 @@ For disabling the behaviour for certain buffers and/or modes."
   (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
@@ -900,6 +909,7 @@ For disabling the behaviour for certain buffers and/or modes."
 \f
 ;;; Theme
 
+(comment
 (add-to-list 'custom-theme-load-path
              (expand-file-name
               (convert-standard-filename "lisp") user-emacs-directory))
@@ -1050,12 +1060,6 @@ For disabling the behaviour for certain buffers and/or modes."
          ("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
@@ -1368,12 +1372,6 @@ For disabling the behaviour for certain buffers and/or modes."
   :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