emacs: further clean ~/.emacs.d by moving more things to {var,etc}/

[~bandali/configs] / .emacs.d / init.el

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6bf61e4..56a7bd1 100644 (file)
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -125,7 +125,9 @@
   "Expand filename FILE relative to `b/var-dir'."
   (expand-file-name (convert-standard-filename file) b/var-dir))
 
   "Expand filename FILE relative to `b/var-dir'."
   (expand-file-name (convert-standard-filename file) b/var-dir))
 

-(setq auto-save-list-file-prefix (b/var "auto-save/sessions/"))
+(setq
+ auto-save-list-file-prefix (b/var "auto-save/sessions/")
+ nsm-settings-file (b/var "nsm-settings.el"))

 
 ;; separate custom file (don't want it mixing with init.el)
 (use-package custom
 
 ;; separate custom file (don't want it mixing with init.el)
 (use-package custom


@@ -435,11 +437,6 @@ For disabling the behaviour for certain buffers and/or modes."
  ("C-x k"   . kill-this-buffer)
  ("C-x K"   . kill-buffer)
 
  ("C-x k"   . kill-this-buffer)
  ("C-x K"   . kill-buffer)
 

- ("s-p"     . beginning-of-buffer)
- ("s-n"     . end-of-buffer)
-
- ("M-O"     . facemenu-keymap)
-

  :map emacs-lisp-mode-map
  ("<C-return>" . b/add-elisp-section))
 
  :map emacs-lisp-mode-map
  ("<C-return>" . b/add-elisp-section))
 


@@ -568,6 +565,9 @@ For disabling the behaviour for certain buffers and/or modes."
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))
   (nconc magit-section-initial-visibility-alist
          '(([unpulled status] . show)
            ([unpushed status] . show)))

+  (setq transient-history-file (b/var "transient/history.el")
+        transient-levels-file  (b/etc "transient/levels.el")
+        transient-values-file  (b/etc "transient/values.el"))

   :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 
   :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 


@@ -581,7 +581,9 @@ For disabling the behaviour for certain buffers and/or modes."
   (recentf-save-file (b/var "recentf-save.el")))
 
 ;; smart M-x enhancement (needed by counsel for history)
   (recentf-save-file (b/var "recentf-save.el")))
 
 ;; smart M-x enhancement (needed by counsel for history)

-(use-package smex)
+(use-package smex
+  :config
+  (setq smex-save-file (b/var "smex-save.el")))

 
 (use-package ivy
   :defer 0.3
 
 (use-package ivy
   :defer 0.3


@@ -681,7 +683,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 (use-package ibuffer
   :bind
 
 (use-package ibuffer
   :bind

-  (("C-x C-b" . ibuffer-other-window)
+  (("C-x C-b" . ibuffer)

    :map ibuffer-mode-map
    ("P"   . ibuffer-backward-filter-group)
    ("N"   . ibuffer-forward-filter-group)
    :map ibuffer-mode-map
    ("P"   . ibuffer-backward-filter-group)
    ("N"   . ibuffer-forward-filter-group)


@@ -1129,7 +1131,10 @@ For disabling the behaviour for certain buffers and/or modes."
     (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
     (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
 
     (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
     (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
 

-(use-package geiser)
+(use-package geiser
+  :config
+  (make-directory (b/var "geiser/") t)
+  (setq geiser-repl-history-filename (b/var "geiser/repl-history")))

 
 (use-package geiser-guile
   :config
 
 (use-package geiser-guile
   :config


@@ -1282,6 +1287,7 @@ For disabling the behaviour for certain buffers and/or modes."
   :defer 0.5
   :bind-keymap ("C-c P" . projectile-command-map)
   :config
   :defer 0.5
   :bind-keymap ("C-c P" . projectile-command-map)
   :config

+  (make-directory (b/var "projectile/") t)

   (projectile-mode)
 
   (defun b/projectile-mode-line-fun ()
   (projectile-mode)
 
   (defun b/projectile-mode-line-fun ()


@@ -1306,7 +1312,9 @@ For disabling the behaviour for certain buffers and/or modes."
        (advice-add 'magit-branch-and-checkout
                    :after #'my-projectile-invalidate-cache)))
   :custom
        (advice-add 'magit-branch-and-checkout
                    :after #'my-projectile-invalidate-cache)))
   :custom

+  (projectile-cache-file (b/var "projectile/cache.el"))

   (projectile-completion-system 'ivy)
   (projectile-completion-system 'ivy)

+  (projectile-known-projects-file (b/var "projectile/known-projects.el"))

   (projectile-mode-line-prefix " proj"))
 
 (use-package helpful
   (projectile-mode-line-prefix " proj"))
 
 (use-package helpful


@@ -1471,7 +1479,9 @@ For disabling the behaviour for certain buffers and/or modes."
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)
                ("c" . mc/edit-lines)
                ("n" . mc/mark-next-like-this)
                ("p" . mc/mark-previous-like-this)

-               ("a" . mc/mark-all-like-this))))
+               ("a" . mc/mark-all-like-this)))
+  :config
+  (setq mc/list-file (b/var "mc-list.el")))

 
 (comment
   ;; TODO
 
 (comment
   ;; TODO


@@ -1484,6 +1494,7 @@ For disabling the behaviour for certain buffers and/or modes."
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)
   :config
   (defconst yas-verbosity-cur yas-verbosity)
   (setq yas-verbosity 2)

+  (setq yas-snippet-dirs (list (b/etc "yasnippet/snippets/")))

   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)
   (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t)
   (yas-reload-all)
   (setq yas-verbosity yas-verbosity-cur)


@@ -1507,16 +1518,20 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
 ;; (use-package fill-column-indicator)
 
 (use-package emojify

+  :config
+  (make-directory (b/var "emojify/") t)
+  (setq emojify-emojis-dir (b/var "emojify/"))

   :hook (erc-mode . emojify-mode))
 
 (use-package window
   :bind
   (("s-o"   . other-window)
   :hook (erc-mode . emojify-mode))
 
 (use-package window
   :bind
   (("s-o"   . other-window)

-   ("M-o"   . other-window)

    ("s-/ ." . split-window-right)
    ("s-/ ," . split-window-below)
    ("s-/ 0" . delete-window)
    ("s-/ ." . split-window-right)
    ("s-/ ," . split-window-below)
    ("s-/ 0" . delete-window)

-   ("s-q"   . delete-window)))
+   ("s-q"   . delete-window))
+  :custom
+  (split-width-threshold 150))

 
 (use-package windmove
   :defer 0.6
 
 (use-package windmove
   :defer 0.6


@@ -2083,6 +2098,7 @@ https://bandalis.org")
 (use-package erc-fill
   :after erc
   :custom
 (use-package erc-fill
   :after erc
   :custom

+  (erc-fill-column 77)

   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))
 
   (erc-fill-function 'erc-fill-static)
   (erc-fill-static-center 18))