diff options
Diffstat (limited to '')
| -rw-r--r-- | emacs.d/init.el | 77 |
1 files changed, 44 insertions, 33 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el index 6ec1675..7aa0a77 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -229,7 +229,9 @@ :commands (markdown-mode gfm-mode) :mode (("\\.md\\'" . gfm-mode) ("\\.markdown\\'" . gfm-mode)) - :init (setq markdown-command "pandoc -f markdown_github -c https://goo.gl/OVmlwT --self-contained")) + :init (setq markdown-command "pandoc -f markdown_github -c https://goo.gl/OVmlwT --self-contained") + :config + (add-hook 'gfm-mode-hook 'visual-line-mode)) (use-package midnight) @@ -255,11 +257,11 @@ projectile-completion-system 'ivy projectile-known-projects-file "~/.emacs.d/var/projectile-bookmarks.eld" projectile-cache-file "~/.emacs.d/var/projectile.cache") - (projectile-global-mode)) + (projectile-mode)) (use-package puppet-mode - :mode ("\\.pp\\'" . puppet-mode) :ensure t + :mode ("\\.pp\\'" . puppet-mode) :init (add-hook 'puppet-mode-hook 'flycheck-mode) :config (setq flycheck-puppet-lint-rc "/Users/fcuny/src/twitter-ops/utilities/puppet/.puppet-lint.rc")) @@ -267,6 +269,8 @@ (use-package python :mode(("\\.aurora$" . python-mode) ("BUILD$" . python-mode) + ("\\.py$" . python-mode)) + :interpreter ("python" . python-mode) :init @@ -275,8 +279,6 @@ :config (setq python-indent-offset 2) (add-hook 'python-mode-hook 'color-identifiers-mode)) - ("\\.py$" . python-mode)) - (use-package recentf :config @@ -290,8 +292,6 @@ sh-indentation 2)) (add-hook 'sh-mode-hook 'set-sh-mode-indent)) -(use-package swiper - :ensure t (use-package shell-pop :defer t :ensure t @@ -303,26 +303,14 @@ (setq-default shell-pop-full-span t) (setq-default shell-pop-window-position "bottom"))) +(use-package swiper + :ensure t :diminish ivy-mode :bind ("C-s" . swiper) :config (setq ivy-use-virtual-buffers t) (ivy-mode)) -(use-package thrift - :ensure t - :mode ("\\.thrift\\'" . thrift-mode) - :config - (setq thrift-indent-level 2)) - -(use-package yaml-mode - :mode ("\\.ya?ml\\'" . yaml-mode)) - -;; ;; configuration for puppet -;; (when (memq window-system '(mac ns x)) -;; (dolist (var '("GEM_HOME" "MY_RUBY_HOME")) -;; (unless (getenv var) -;; (exec-path-from-shell-copy-env var)))) (use-package term :bind (("C-x t" . fc/open-term) ("C-x m" . fc/switch-to-term-buffer)) @@ -359,25 +347,48 @@ :action (lambda (x) (switch-to-buffer x)) :caller 'fc/find-term-buffers))))) +(use-package thrift + :ensure t + :mode ("\\.thrift\\'" . thrift-mode) + :config + (setq thrift-indent-level 2)) + +(use-package time + :config + (setq display-time-format "%I:%M" + display-time-default-load-average nil + display-time-24hr-format t) + (display-time-mode +1)) + +(use-package tramp + :config + (setq tramp-default-method "ssh")) + +(use-package yaml-mode + :ensure t + :mode ("\\.ya?ml\\'" . yaml-mode)) ;; some bindings (global-set-key (kbd "M-j") 'join-line) (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen) (define-key emacs-lisp-mode-map (kbd "C-c C-e") 'eval-buffer) +(define-key emacs-lisp-mode-map (kbd "C-c C-r") 'eval-region) ;; start the server if not already running (require 'server) (unless (server-running-p) (server-start)) -(use-package shell-pop - :defer t - :ensure t - :bind ("C-:" . shell-pop) - :init - (progn - (setq-default shell-pop-shell-type '("eshell" "*eshell-pop*" (lambda nil (eshell)))) - (setq-default shell-pop-window-height 30) - (setq-default shell-pop-full-span t) - (setq-default shell-pop-window-position "bottom"))) - -(define-key emacs-lisp-mode-map (kbd "C-c C-r") 'eval-region) +(custom-set-variables + ;; 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. + '(package-selected-packages + (quote + (flycheck-pos-tip puppet-mode ag projectile magit multi-term shell-pop esh-opt em-term thrift json-mode helm gist flycheck exec-path-from-shell counsel use-package)))) +(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. + ) |