No more tabs in init.el

This commit is contained in:
Ivan Malison 2015-01-02 12:24:19 -08:00
parent c53ea6efa2
commit 82eaad169d

View File

@ -42,7 +42,7 @@
(require 'package) (require 'package)
(add-to-list 'package-archives (add-to-list 'package-archives
'("marmalade" . "http://marmalade-repo.org/packages/") t) '("marmalade" . "http://marmalade-repo.org/packages/") t)
(add-to-list 'package-archives '("elpa" . "http://tromey.com/elpa/") t) (add-to-list 'package-archives '("elpa" . "http://tromey.com/elpa/") t)
(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t) (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
@ -1133,9 +1133,9 @@ marking if it still had that."
:init (flx-ido-mode 1) :init (flx-ido-mode 1)
:config :config
(progn (progn
;; disable ido faces to see flx highlights. ;; disable ido faces to see flx highlights.
;; This makes flx-ido much faster. ;; This makes flx-ido much faster.
(setq gc-cons-threshold 20000000) (setq gc-cons-threshold 20000000)
(setq ido-use-faces nil))) (setq ido-use-faces nil)))
(use-package ido-ubiquitous (use-package ido-ubiquitous
:ensure t :ensure t
@ -1203,7 +1203,7 @@ marking if it still had that."
(defun add-virtual-envs-to-jedi-server () (defun add-virtual-envs-to-jedi-server ()
(let ((virtual-envs (get-virtual-envs))) (let ((virtual-envs (get-virtual-envs)))
(when virtual-envs (set (make-local-variable 'jedi:server-args) (when virtual-envs (set (make-local-variable 'jedi:server-args)
(make-virtualenv-args virtual-envs))))) (make-virtualenv-args virtual-envs)))))
(defun make-virtualenv-args (virtual-envs) (defun make-virtualenv-args (virtual-envs)
(apply #'append (mapcar (lambda (env) `("-v" ,env)) virtual-envs))) (apply #'append (mapcar (lambda (env) `("-v" ,env)) virtual-envs)))
@ -1223,7 +1223,7 @@ marking if it still had that."
(defun message-virtual-envs () (defun message-virtual-envs ()
(interactive) (interactive)
(message "%s" (get-virtual-envs))) (message "%s" (get-virtual-envs)))
(use-package python (use-package python
:commands python-mode :commands python-mode
@ -1267,11 +1267,11 @@ marking if it still had that."
(use-package scala-mode2 (use-package scala-mode2
:init :init
(progn (add-hook 'scala-mode-hook (progn (add-hook 'scala-mode-hook
(lambda () (lambda ()
(require 'whitespace) (require 'whitespace)
(make-local-variable 'before-save-hook) (make-local-variable 'before-save-hook)
(add-hook 'before-save-hook 'whitespace-cleanup) (add-hook 'before-save-hook 'whitespace-cleanup)
(whitespace-mode)))) (whitespace-mode))))
:config :config
(progn (progn
(use-package ensime (use-package ensime
@ -1315,8 +1315,8 @@ marking if it still had that."
(progn (tern-ac-setup)) (progn (tern-ac-setup))
:init :init
(progn (progn
(use-package tern-auto-complete :ensure t (use-package tern-auto-complete :ensure t
:commands tern-ac-setup))))) :commands tern-ac-setup)))))
(use-package json-mode (use-package json-mode
:ensure t :ensure t
@ -1351,9 +1351,9 @@ marking if it still had that."
(use-package helm-gtags (use-package helm-gtags
:ensure t :ensure t
:config (custom-set-variables :config (custom-set-variables
'(helm-gtags-path-style 'relative) '(helm-gtags-path-style 'relative)
'(helm-gtags-ignore-case t) '(helm-gtags-ignore-case t)
'(helm-gtags-auto-update t)) '(helm-gtags-auto-update t))
:bind :bind
(("M-t" . helm-gtags-find-tag) (("M-t" . helm-gtags-find-tag)
("M-r" . helm-gtags-find-rtag) ("M-r" . helm-gtags-find-rtag)
@ -1392,7 +1392,7 @@ marking if it still had that."
(use-package yaml-mode :ensure t (use-package yaml-mode :ensure t
:mode (("\\.yaml\\'" . yaml-mode) :mode (("\\.yaml\\'" . yaml-mode)
("\\.yml\\'" . yaml-mode))) ("\\.yml\\'" . yaml-mode)))
(use-package sgml-mode (use-package sgml-mode
:ensure t :ensure t
@ -1434,8 +1434,8 @@ marking if it still had that."
(fset 'global-set-key-to-use-package (fset 'global-set-key-to-use-package
(lambda (&optional arg) "Keyboard macro." (interactive "p") (lambda (&optional arg) "Keyboard macro." (interactive "p")
(kmacro-exec-ring-item (kmacro-exec-ring-item
(quote ([1 67108896 19 100 6 23 40 19 41 return (quote ([1 67108896 19 100 6 23 40 19 41 return
backspace 32 46 6 4] 0 "%d")) arg))) backspace 32 46 6 4] 0 "%d")) arg)))
;; ============================================================================= ;; =============================================================================
;; toys ;; toys
@ -1524,8 +1524,8 @@ marking if it still had that."
(interactive (interactive
(list (list
(intern (completing-read "Load custom theme: " (intern (completing-read "Load custom theme: "
(mapcar 'symbol-name (mapcar 'symbol-name
(custom-available-themes)))) (custom-available-themes))))
nil nil)) nil nil))
(disable-all-themes) (disable-all-themes)
(load-theme theme no-confirm no-enable)) (load-theme theme no-confirm no-enable))
@ -1535,7 +1535,7 @@ marking if it still had that."
(condition-case exp (condition-case exp
(set-frame-font (random-choice fonts) nil t) (set-frame-font (random-choice fonts) nil t)
('error (package-refresh-contents) ('error (package-refresh-contents)
(set-frame-font "Monaco for Powerline-12" nil t) nil))) (set-frame-font "Monaco for Powerline-12" nil t) nil)))
(defun remove-fringe-and-hl-line-mode (&rest stuff) (defun remove-fringe-and-hl-line-mode (&rest stuff)
(if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1)) (if (fboundp 'scroll-bar-mode) (scroll-bar-mode -1))