Merge branch 'master' of https://git.zom.bi/madmaurice/configfiles
This commit is contained in:
commit
c7d463c50e
1 changed files with 12 additions and 2 deletions
14
emacs/.emacs
14
emacs/.emacs
|
@ -21,6 +21,9 @@
|
||||||
(height . 40)
|
(height . 40)
|
||||||
))
|
))
|
||||||
|
|
||||||
|
;; Use cperl-mode instead of perl-mode
|
||||||
|
(defalias 'perl-mode 'cperl-mode)
|
||||||
|
|
||||||
(defun silence ()
|
(defun silence ()
|
||||||
(interactive))
|
(interactive))
|
||||||
|
|
||||||
|
@ -51,7 +54,7 @@
|
||||||
'(menu-bar-mode nil)
|
'(menu-bar-mode nil)
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
(quote
|
(quote
|
||||||
(shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
|
(terminal-here shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
|
||||||
'(scroll-bar-mode nil)
|
'(scroll-bar-mode nil)
|
||||||
'(shell-pop-shell-type
|
'(shell-pop-shell-type
|
||||||
(quote
|
(quote
|
||||||
|
@ -161,7 +164,14 @@
|
||||||
:demand t
|
:demand t
|
||||||
:config (progn
|
:config (progn
|
||||||
(require 'auto-complete-config)
|
(require 'auto-complete-config)
|
||||||
(ac-config-default)))
|
(setq ac-sources '(ac-source-filename
|
||||||
|
ac-source-functions
|
||||||
|
ac-source-yasnippet
|
||||||
|
ac-source-variables
|
||||||
|
ac-source-symbols
|
||||||
|
ac-source-features
|
||||||
|
ac-source-words-in-all-buffer
|
||||||
|
ac-source-dictionary))))
|
||||||
|
|
||||||
;; ivy
|
;; ivy
|
||||||
(use-package ivy
|
(use-package ivy
|
||||||
|
|
Loading…
Reference in a new issue