diff --git a/.emacs b/.emacs index 5cc980f..aa2967d 100644 --- a/.emacs +++ b/.emacs @@ -1,3 +1,5 @@ +(setq ispell-program-name "/usr/local/bin/ispell") + (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) @@ -9,11 +11,36 @@ (server-start) (put 'upcase-region 'disabled nil) -(add-hook 'before-save-hook 'delete-trailing-whitespace) -;; (setq column-number-mode t) +;;(add-hook 'before-save-hook 'delete-trailing-whitespace) +;;(setq column-number-mode t) (custom-set-variables - '(fill-column 80) + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. '(column-number-mode t) - '(package-selected-packages (quote (markdown-mode))) - '(tab-width 4)) + '(fill-column 80) + '(package-selected-packages (quote (php-mode rust-mode magit markdown-mode))) + '(tab-width 4) + '(visible-bell 1)) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) + + +;; TODO +; magit-status --> press [TAB] +; magit-stage +;;;;;;; in: .dir-locals.el +;;;;;;; (setq before-save-hook nil) +;;;;;;; ;;(add-hook 'before-save-hook 'delete-trailing-whitespace) +; k -- discard staged and unstaged (undo) + +(global-set-key (kbd "C-x ") 'windmove-up) +(global-set-key (kbd "C-x ") 'windmove-down) +(global-set-key (kbd "C-x ") 'windmove-right) +(global-set-key (kbd "C-x ") 'windmove-left)