Browse Source

some minor changes to emacs for python and zsh

master
Taylor Bockman 5 years ago
parent
commit
bada83f1c6
  1. 4
      .gitignore
  2. 9
      dotfiles/emacs.d/init.el
  3. 1
      dotfiles/emacs.d/package.el
  4. 5
      dotfiles/zshrc

4
.gitignore vendored

@ -57,3 +57,7 @@ dotfiles/config/xbuild
dotfiles/config/stetic dotfiles/config/stetic
dotfiles/config/NuGet dotfiles/config/NuGet
dotfiles/config/GitExtensions dotfiles/config/GitExtensions
# Jedi Python Environment
dotfiles/emacs.d/.python-environments/*

9
dotfiles/emacs.d/init.el

@ -227,7 +227,7 @@
;; Line Numbering - Note: Might not look good with files with 10,000 or more lines ;; Line Numbering - Note: Might not look good with files with 10,000 or more lines
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
;; NOTE: Line numbers are toggled with C-s n ;; NOTE: Line numbers are toggled with C-c n
(defvar linum-format) (defvar linum-format)
(setq linum-format "%4d \u2502") (setq linum-format "%4d \u2502")
@ -278,6 +278,11 @@
(global-company-mode t) (global-company-mode t)
(add-hook 'after-init-hook 'global-company-mode) (add-hook 'after-init-hook 'global-company-mode)
(defun company/python-mode-hook ()
(add-to-list 'company-backends 'company-jedi))
(add-hook 'python-mode-hook 'company/python-mode-hook)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
;; Alignment ;; Alignment
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
@ -474,7 +479,7 @@
(set-terminal-parameter nil 'background-mode 'dark) (set-terminal-parameter nil 'background-mode 'dark)
(load-theme 'material t) (load-theme 'material t)
;; 10 pt font ;; 12 pt font
(set-frame-font "inconsolata") (set-frame-font "inconsolata")
(set-face-attribute 'default nil :height 120) (set-face-attribute 'default nil :height 120)

1
dotfiles/emacs.d/package.el

@ -5,6 +5,7 @@
company company
company-irony company-irony
company-emacs-eclim company-emacs-eclim
company-jedi
eclim eclim
irony irony
counsel counsel

5
dotfiles/zshrc

@ -14,9 +14,8 @@ fi
if [[ "$OSTYPE" == "linux-gnu" ]]; then if [[ "$OSTYPE" == "linux-gnu" ]]; then
# Linux # Linux
eval `dircolors ~/.dir_colors/dircolors` export VISUAL="emacs"
export VISUAL="nvim" alias emacs="$VISUAL"
alias vim="$VISUAL"
elif [[ "$OSTYPE" == "darwin"* ]]; then elif [[ "$OSTYPE" == "darwin"* ]]; then
# Mac OSX # Mac OSX
export VISUAL="/usr/local/bin/nvim" export VISUAL="/usr/local/bin/nvim"

Loading…
Cancel
Save