From 403898a2b1d3ac35bec7d619a1a1c838c7c36bc4 Mon Sep 17 00:00:00 2001 From: Raphael Roberts Date: Sat, 21 Sep 2019 14:28:57 -0500 Subject: [PATCH] Added spaceline and spelling/saving customizations --- custom.el | 3 +- settings.org | 84 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/custom.el b/custom.el index f3c0083..078ec1d 100644 --- a/custom.el +++ b/custom.el @@ -9,6 +9,7 @@ '(custom-safe-themes (quote ("274fa62b00d732d093fc3f120aca1b31a6bb484492f31081c1814a858e25c72e" default))) + '(delete-by-moving-to-trash t) '(dired-listing-switches "-alh") '(elpy-eldoc-show-current-function nil) '(hippie-expand-try-functions-list @@ -29,7 +30,7 @@ '(inhibit-startup-screen t) '(package-selected-packages (quote - (use-package kv lispy ibuffer-vc ag string-inflection tiny powershell diffview ivy-hydra window-numbering php-mode swiper mode-line-bell htmlize cython-mode blacken dired-narrow lua-mode browse-kill-ring clipmon free-keys org-link-minor-mode js2-mode js2-refactor xref-js2 python-django visual-regexp-steroids pcre2el vimrc-mode iedit transient magit dracula-theme flycheck elpy ein better-defaults ssh-config-mode yaml-mode apache-mode web-mode undo-tree))) + (ace-window winum spaceline powerline use-package kv lispy ibuffer-vc ag string-inflection tiny powershell diffview ivy-hydra php-mode swiper mode-line-bell htmlize cython-mode blacken dired-narrow lua-mode browse-kill-ring clipmon free-keys org-link-minor-mode js2-mode js2-refactor xref-js2 python-django visual-regexp-steroids pcre2el vimrc-mode iedit transient magit dracula-theme flycheck elpy ein better-defaults ssh-config-mode yaml-mode apache-mode web-mode undo-tree))) '(reb-re-syntax (quote string)) '(tramp-use-ssh-controlmaster-options nil nil (tramp))) (custom-set-faces diff --git a/settings.org b/settings.org index f407711..e81f43b 100644 --- a/settings.org +++ b/settings.org @@ -1,4 +1,20 @@ * Editing +** IEdit mode +#+BEGIN_SRC emacs-lisp + (use-package iedit + :bind ("C-;" . iedit-mode)) +#+END_SRC +** Spellcheck +#+BEGIN_SRC emacs-lisp + (global-set-key (kbd "C-!") 'ispell-buffer) +#+END_SRC +** Undo tree +#+BEGIN_SRC emacs-lisp + (use-package undo-tree + :config + (global-undo-tree-mode)) +#+END_SRC +* Save/load ** Backup/auto-save #+BEGIN_SRC emacs-lisp (let ((backup-dir "~/.emacs.d/backup") @@ -9,24 +25,20 @@ auto-save-dir)) (make-directory auto-save-dir))) #+END_SRC -** Hippie expand +** On save #+BEGIN_SRC emacs-lisp - (use-package hippie-exp - :bind ("M-/" . hippie-expand)) + (add-hook 'before-save-hook 'delete-trailing-whitespace) #+END_SRC -** IEdit mode +** Recent files mode #+BEGIN_SRC emacs-lisp - (use-package iedit - :bind ("C-;" . iedit-mode)) + (use-package recentf + :config + (recentf-mode 1)) #+END_SRC -** Line numbers +* Platform dependant +** Windows #+BEGIN_SRC emacs-lisp - (global-display-line-numbers-mode) #+END_SRC -* Unix buffer things -** Platform fixes -** Key bindings -** Custom features/Monkey patches * Major modes ** Java ** JavaScript @@ -72,11 +84,35 @@ :mode "\\.yml\\'") #+END_SRC * Minor modes/misc +** Kill the things +*** Buffer +#+BEGIN_SRC emacs-lisp +(global-set-key (kbd "C-x k") 'kill-this-buffer) +#+END_SRC +*** Emacs +#+BEGIN_SRC emacs-lisp +(global-set-key (kbd "C-x C-k C-x C-k") 'kill-emacs) +#+END_SRC +** Lispy +#+BEGIN_SRC emacs-lisp + (use-package lispy + :hook ((emacs-lisp-mode) . lispy-mode)) +#+END_SRC +* Navigation/autocompletion +** Ace window +#+BEGIN_SRC emacs-lisp + (use-package ace-window + :bind (("M-Q" . ace-window))) +#+END_SRC +** Hippie expand +#+BEGIN_SRC emacs-lisp + (use-package hippie-exp + :bind ("M-/" . hippie-expand)) +#+END_SRC ** IBuffer mode #+BEGIN_SRC emacs-lisp (use-package ibbufer-vc :hook ((ibuffer-mode . ibuffer-vc-set-filter-groups-by-vc-root))) - (use-package ibuffer :bind (("C-x C-b" . ibuffer)) :config @@ -100,23 +136,15 @@ :bind ("C-s" . swiper)) (ivy-mode)) #+END_SRC -** Kill the things -*** Buffer -#+BEGIN_SRC emacs-lisp -(global-set-key (kbd "C-x k") 'kill-this-buffer) -#+END_SRC -*** Emacs -#+BEGIN_SRC emacs-lisp -(global-set-key (kbd "C-x C-k C-x C-k") 'kill-emacs) -#+END_SRC -** Lispy +* Look and feel +** Line numbers #+BEGIN_SRC emacs-lisp - (use-package lispy - :hook ((emacs-lisp-mode) . lispy-mode)) + (global-display-line-numbers-mode) #+END_SRC -** Window numbering mode +** Spaceline #+BEGIN_SRC emacs-lisp - (use-package window-numbering + (use-package spaceline-config :config - (window-numbering-mode)) + (spaceline-spacemacs-theme) + (winum-mode)) #+END_SRC