diff options
| -rw-r--r-- | emacs/.emacs | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/emacs/.emacs b/emacs/.emacs index a904029..07376b7 100644 --- a/emacs/.emacs +++ b/emacs/.emacs @@ -7,7 +7,7 @@ (mapcar (lambda (p) (unless (package-installed-p p) (package-install p)) - ) (list 'evil 'haskell-mode 'bbdb)) + ) (list 'magit 'undo-tree 'evil 'haskell-mode 'bbdb 'company)) (setq evil-want-C-u-scroll t) (require 'evil) @@ -16,6 +16,13 @@ ; (require 'evil-collection) ; (evil-collection-init) +(require 'magit) + +(require 'undo-tree) +(global-undo-tree-mode 1) +(evil-set-undo-system 'undo-tree) +(setq undo-tree-history-directory-alist '(("." . "~/.emacs.d/undo"))) + (winner-mode 1) (global-set-key (kbd "C-c u") #'winner-undo) @@ -55,7 +62,11 @@ (require 'bbdb) (bbdb-initialize 'gnus 'message) -(setq org-icalendar-combined-agenda-file "org.ics") +(setq icalendar-export-sexp-enumerate-all t) +(setq org-icalendar-combined-agenda-file "~/org.ics") + +;; Company mode +(add-hook 'after-init-hook 'global-company-mode) ;; Load email configuration (defun load-if-exists (file) @@ -68,12 +79,16 @@ ;; 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. - '(custom-enabled-themes '(tango-dark)) - '(package-selected-packages '(bbdb haskell-mode evil)) + '(custom-enabled-themes '(modus-vivendi)) + '(display-line-numbers-type 'relative) + '(global-display-line-numbers-mode t) + '(package-selected-packages + '(magit undo-tree 'flycheck 'flycheck bbdb haskell-mode evil)) + '(tool-bar-mode nil) '(warning-suppress-types '((org)))) (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. - ) + '(default ((t (:family "Ubuntu Mono" :foundry "DAMA" :slant normal :weight normal :height 127 :width normal))))) |