finish refator to use use-package

This commit is contained in:
2021-02-19 10:35:47 +01:00
parent f80cd4dae9
commit 225ad4c1b5

141
init.el
View File

@@ -27,7 +27,6 @@ There are two things you can do about this warning:
(package-refresh-contents) (package-refresh-contents)
(package-install 'use-package) (package-install 'use-package)
(package-install 'use-package-chords)) (package-install 'use-package-chords))
(require 'use-package) (require 'use-package)
(setq use-package-always-ensure t) (setq use-package-always-ensure t)
@@ -96,7 +95,8 @@ There are two things you can do about this warning:
:config :config
(evil-mode 1) (evil-mode 1)
(evil-set-undo-system 'undo-tree) (evil-set-undo-system 'undo-tree)
(evil-set-initial-state 'term-mode 'emacs)) (evil-set-initial-state 'term-mode 'emacs)
(evil-set-initial-state 'dired-mode 'emacs))
(use-package evil-collection (use-package evil-collection
:after (:all evil magit) :after (:all evil magit)
@@ -293,77 +293,68 @@ There are two things you can do about this warning:
:mode (("\\.yml\\'" . yaml-mode) :mode (("\\.yml\\'" . yaml-mode)
("\\.yaml\\'" . yaml-mode))) ("\\.yaml\\'" . yaml-mode)))
(when (fboundp 'menu-bar-mode) (menu-bar-mode -1)) ;; Configure emacs general settings with use-package
(when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
(when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
(when (fboundp 'windmove-default-keybindings) (windmove-default-keybindings))
(setq frame-title-format (use-package emacs
'(buffer-file-name "%f" (dired-directory dired-directory "%b")) :init
custom-file "~/.emacs.d/custom.el" (defun remove-elc ()
auth-source-save-behavior nil "If you're saving an elisp file, likely the .elc is no longer valid."
enable-local-variables nil (if (file-exists-p (concat buffer-file-name "c"))
inhibit-startup-screen t (delete-file (concat buffer-file-name "c"))))
vc-follow-symlinks t (defun gcm-scroll-down () (interactive) (scroll-up 1))
inhibit-compacting-font-caches 1 (defun gcm-scroll-up () (interactive) (scroll-down 1))
mouse-wheel-scroll-amount '(3 ((shift) . 3)) :config
mouse-wheel-progressive-speed nil (when (fboundp 'menu-bar-mode) (menu-bar-mode -1))
mouse-wheel-follow-mouse 't (when (fboundp 'tool-bar-mode) (tool-bar-mode -1))
scroll-conservatively 10000 (when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))
scroll-step 1 (when (fboundp 'windmove-default-keybindings) (windmove-default-keybindings))
auto-save-interval 1000 (setq frame-title-format
auto-window-vscroll nil '(buffer-file-name "%f" (dired-directory dired-directory "%b"))
backup-by-copying t custom-file "~/.emacs.d/custom.el"
backup-directory-alist '(("." . "~/.saves")) auth-source-save-behavior nil
delete-old-versions t enable-local-variables nil
kept-new-versions 6 inhibit-startup-screen t
kept-old-versions 2 vc-follow-symlinks t
version-control t inhibit-compacting-font-caches 1
backup-directory-alist `((".*" . ,temporary-file-directory)) mouse-wheel-scroll-amount '(3 ((shift) . 3))
auto-save-file-name-transforms `((".*" ,temporary-file-directory t)) mouse-wheel-progressive-speed nil
vc-mode 1 mouse-wheel-follow-mouse 't
ring-bell-function 'ignore scroll-conservatively 10000
column-number-mode 1 scroll-step 1
savehist-mode 1) auto-save-interval 1000
auto-window-vscroll nil
(setq-default scroll-up-aggressively 0.01 backup-by-copying t
scroll-down-aggressively 0.01 backup-directory-alist '(("." . "~/.saves"))
indent-tabs-mode t delete-old-versions t
tab-width 8) kept-new-versions 6
kept-old-versions 2
(global-auto-revert-mode 1) version-control t
(fringe-mode '(0 . 0)) backup-directory-alist `((".*" . ,temporary-file-directory))
(show-paren-mode t) auto-save-file-name-transforms `((".*" ,temporary-file-directory t))
(electric-pair-mode 1) vc-mode 1
(global-hl-line-mode 1) ring-bell-function 'ignore
(blink-cursor-mode 0) column-number-mode 1
(setq blink-cursor-blinks 0) savehist-mode 1)
(display-time-mode 1) (setq-default scroll-up-aggressively 0.01
scroll-down-aggressively 0.01
(defun remove-elc-on-save () indent-tabs-mode t
"If you're saving an elisp file, likely the .elc is no longer valid." tab-width 8)
(add-hook 'after-save-hook (global-auto-revert-mode 1)
(lambda () (fringe-mode '(0 . 0))
(if (file-exists-p (concat buffer-file-name "c")) (global-hl-line-mode 1)
(delete-file (concat buffer-file-name "c")))) (blink-cursor-mode 0)
nil (setq blink-cursor-blinks 0)
t)) (display-time-mode 1)
(electric-pair-mode 1)
(add-hook 'emacs-lisp-mode-hook 'remove-elc-on-save) (show-paren-mode t)
(add-hook 'before-save-hook 'delete-trailing-whitespace) (define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit) (define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit) (define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit) (define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit) :bind (("C-<down>" . gcm-scroll-down)
(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit) ("C-<next>" . gcm-scroll-down)
("C-<up>" . gcm-scroll-up)
(defun gcm-scroll-down () (interactive) (scroll-up 1)) ("C-<prior>" . gcm-scroll-up))
:hook ((before-save . delete-trailing-whitespace)
(defun gcm-scroll-up () (interactive) (scroll-down 1)) (after-save . remove-elc)))
(global-set-key [(control down)] 'gcm-scroll-down)
(global-set-key [(control up)] 'gcm-scroll-up)
(global-set-key [(control next)] 'gcm-scroll-down)
(global-set-key [(control prior)] 'gcm-scroll-up)