Browse Source

Merge branch 'master' of git.xchg.sh:angrygoats/essentials

master
Taylor Bockman 4 years ago
parent
commit
e709cc16ba
  1. 1
      dotfiles/bash/bash_profile
  2. 23
      dotfiles/emacs.d/init.el
  3. 5
      dotfiles/emacs.d/package.el

1
dotfiles/bash/bash_profile

@ -7,3 +7,4 @@ export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
export PATH="/usr/local/opt/openjdk/bin:$PATH"
export PATH="/usr/local/opt/llvm/bin:$PATH"
export PATH="/usr/local/opt/qt/bin:$PATH"
export PATH="/usr/local/opt/tcl-tk/bin:$PATH"

23
dotfiles/emacs.d/init.el

@ -186,8 +186,16 @@ There are two things you can do about this warning:
;; For Python enable Elpy.
(use-package elpy
:ensure t
:init (elpy-enable))
:ensure t
:init (elpy-enable))
;; Enable pyenv integration.
(use-package pyenv-mode
:config
(pyenv-mode))
;; Disable elpy default virtualenv (use the pyenv one)
(setq elpy-rpc-virtualenv-path 'current)
;;--------------------------------------------------------------------------------------
;; Save hooks
@ -195,6 +203,17 @@ There are two things you can do about this warning:
(add-hook 'before-save-hook 'delete-trailing-whitespace)
;; Automagically enable the right pyenv if a .python-version exists
(defun ssbb-pyenv-hook ()
"Automatically activates pyenv version if .python-version file exists."
(f-traverse-upwards
(lambda (path)
(let ((pyenv-version-path (f-expand ".python-version" path)))
(if (f-exists? pyenv-version-path)
(pyenv-mode-set (s-trim (f-read-text pyenv-version-path 'utf-8))))))))
;;--------------------------------------------------------------------------------------
;; Keybinds
;;--------------------------------------------------------------------------------------

5
dotfiles/emacs.d/package.el

@ -79,9 +79,12 @@
rtags
company-rtags
;; Environments
pyenv-mode
;;General
use-package
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
)

Loading…
Cancel
Save