Browse Source

Fix all-the-icons, improve elisp complicance

master
Riyyi 5 years ago
parent
commit
7fed97db08
  1. 18
      .emacs.d/config.org
  2. 16
      .emacs.d/init.el

18
.emacs.d/config.org

@ -32,7 +32,7 @@ Store custom-file separately, don't freak out when it's not found.
Set custom faces, without using customize. Set custom faces, without using customize.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(set-face-attribute 'default nil :height 90 :family "DejaVu Sans Mono") (set-default-font "DejaVu Sans Mono 9")
#+END_SRC #+END_SRC
* Package Management * Package Management
@ -98,6 +98,7 @@ Install and configure packages.
))) )))
(use-package which-key (use-package which-key
:defer 1
:custom :custom
(which-key-add-column-padding 1) (which-key-add-column-padding 1)
(which-key-max-display-columns nil) (which-key-max-display-columns nil)
@ -106,8 +107,7 @@ Install and configure packages.
(which-key-sort-uppercase-first nil) (which-key-sort-uppercase-first nil)
:config (which-key-mode)) :config (which-key-mode))
(use-package general (use-package general)
:after which-key)
(use-package ido-vertical-mode (use-package ido-vertical-mode
:config (ido-vertical-mode)) :config (ido-vertical-mode))
@ -199,9 +199,7 @@ Collect icon fonts and propertize them within Emacs\\
(requires M-x =all-the-icons-install-fonts=). (requires M-x =all-the-icons-install-fonts=).
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package memoize) (use-package all-the-icons)
(use-package all-the-icons
:after memoize)
#+END_SRC #+END_SRC
Provides Emacs with a file tree. Provides Emacs with a file tree.
@ -602,14 +600,14 @@ Functions that only use built-in Emacs functionality.
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun bookmark-jump-ido () (defun bookmark-jump-ido ()
"Uses ido to search for the bookmark" "Use ido to search for the bookmark."
(interactive) (interactive)
(bookmark-jump (bookmark-jump
(bookmark-get-bookmark (bookmark-get-bookmark
(ido-completing-read "Jump to bookmark: " (bookmark-all-names))))) (ido-completing-read "Jump to bookmark: " (bookmark-all-names)))))
(defun bookmark-delete-ido () (defun bookmark-delete-ido ()
"Uses ido to search for the bookmark to delete" "Use ido to search for the bookmark to delete."
(interactive) (interactive)
(bookmark-delete (bookmark-delete
(bookmark-get-bookmark (bookmark-get-bookmark
@ -948,7 +946,7 @@ General.el ~leader key binds.
"c p" '(evilnc-comment-or-uncomment-paragraphs :which-key "Toggle comment paragraph") "c p" '(evilnc-comment-or-uncomment-paragraphs :which-key "Toggle comment paragraph")
"c r" '(config-reload :which-key "Config reload") "c r" '(config-reload :which-key "Config reload")
"c v" '(config-visit :which-key "Config visit") "c v" '(config-visit :which-key "Config visit")
"c y" '(evilnc-comment-and-kill-ring-save :which-key "Comment and save") "c y" '(evilnc-comment-and-kill-ring-save :which-key "Comment and copy")
;; LSP ;; LSP
"d" '(:ignore t :which-key "lsp") "d" '(:ignore t :which-key "lsp")
@ -983,7 +981,7 @@ General.el ~leader key binds.
"q q" '(save-buffers-kill-terminal :which-key "Quit Emacs") "q q" '(save-buffers-kill-terminal :which-key "Quit Emacs")
"q Q" '(save-buffers-kill-emacs :which-key "Quit Emacs (and daemon)") "q Q" '(save-buffers-kill-emacs :which-key "Quit Emacs (and daemon)")
"q f" '(delete-frame :which-key "Close frame") "q f" '(delete-frame :which-key "Close frame")
"q o" '(delete-other-frame :which-key "Close other frame") "q o" '(delete-other-frames :which-key "Close other frames")
;; Reformat region ;; Reformat region
"r" '(:ignore t :which-key "region") "r" '(:ignore t :which-key "region")

16
.emacs.d/init.el

@ -1,7 +1,15 @@
;;; package --- Emacs init file
;;; Commentary:
;; Setup package manager and build configuration org file.
;;; Code:
;; Increases garbage collection during startup ;; Increases garbage collection during startup
(setq startup/gc-cons-threshold gc-cons-threshold) (defvar startup/gc-cons-threshold gc-cons-threshold)
(setq gc-cons-threshold most-positive-fixnum) (setq gc-cons-threshold most-positive-fixnum)
(defun startup/reset-gc () (setq gc-cons-threshold startup/gc-cons-threshold)) (defun startup/reset-gc () "." (setq gc-cons-threshold startup/gc-cons-threshold))
(add-hook 'emacs-startup-hook 'startup/reset-gc) (add-hook 'emacs-startup-hook 'startup/reset-gc)
; -------------------------------------- ; --------------------------------------
@ -25,7 +33,9 @@
; -------------------------------------- ; --------------------------------------
;; Load actual config file ;; Tangle configuration file
(require 'org) (require 'org)
(when (file-readable-p (expand-file-name "config.org" user-emacs-directory)) (when (file-readable-p (expand-file-name "config.org" user-emacs-directory))
(org-babel-load-file (expand-file-name "config.org" user-emacs-directory))) (org-babel-load-file (expand-file-name "config.org" user-emacs-directory)))
;;; init.el ends here

Loading…
Cancel
Save