Delete emacs app for now.

This commit is contained in:
2015-04-28 13:44:03 -07:00
parent 2bba2a4ab4
commit 4102e05210
239 changed files with 187 additions and 331 deletions

View File

@@ -1567,23 +1567,29 @@ window is active in the perspective."
:init
(progn
(setq js2-bounce-indent-p nil)
(setq js2-basic-offset 2)
(setq js2-basic-offset 4)
(setq js2-indent-level 4)
(setq js2-basic-offset 4)
(use-package skewer-mode
:ensure t
:commands skewer-mode)
(add-hook 'js-mode-hook 'js2-minor-mode)
(add-hook 'js2-mode-hook (lambda () (tern-mode t)))
(add-hook 'js2-mode-hook 'skewer-mode)
(add-hook 'js2-mode-hook (lambda () (setq js-indent-level 1)))
(add-hook 'js2-mode-hook (lambda () (setq js-indent-level 4)
(setq js2-indent-level 4)
(setq js2-basic-offset 4)))
(use-package tern
:commands tern-mode
:ensure t
:config
(progn (tern-ac-setup))
:init
(progn
(use-package tern-auto-complete :ensure t
:commands tern-ac-setup)))))
(use-package company-tern
:config (add-to-list 'company-backends 'company-tern))
(progn (tern-ac-setup)))))
(defun delete-tern-process ()
(interactive)
(delete-process "tern"))
(use-package json-mode
:ensure t
@@ -1591,7 +1597,7 @@ window is active in the perspective."
:init
(add-hook 'json-mode-hook
(lambda ()
(setq js-indent-level 2))))
(setq js-indent-level 4))))
(add-hook 'css-mode-hook #'skewer-css-mode)
(add-hook 'html-mode-hook #'skewer-html-mode)

12
dotfiles/lib/git-ssh.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
# If parent command is "npm ...", then redirect stderr to /dev/null
# https://github.com/npm/npm/issues/7979#issuecomment-94953923
GRANDPARENT_PID=$(ps -p $PPID -o ppid=)
if ps -p $GRANDPARENT_PID -o command= | grep -q -P "^npm"; then
ssh "$@" 2>/dev/null
else
ssh "$@"
fi

View File

@@ -59,3 +59,6 @@ export RBENV_ROOT=/usr/local/var/rbenv
export PATH="$HOME/.rbenv/bin:$PATH"
hash rbenv 2> /dev/null && eval "$(rbenv init -)"
test -e /usr/libexec/path_helper && eval `/usr/libexec/path_helper -s`
export NODE_PATH="/usr/local/lib/node_modules/"

View File

@@ -1,6 +1,7 @@
# added by newengsetup
export UBER_HOME="$HOME/Uber"
export UBER_OWNER="imalison@uber.com"
[ -z "$GIT_SSH" ] || export GIT_SSH="$HOME/.lib/git-ssh.sh"
export VAGRANT_DEFAULT_PROVIDER=aws
[ -s "/usr/local/bin/virtualenvwrapper.sh" ] && . /usr/local/bin/virtualenvwrapper.sh
[ -s "$HOME/.nvm/nvm.sh" ] && . $HOME/.nvm/nvm.sh

View File

@@ -4,6 +4,8 @@ elif infocmp xterm-256color >/dev/null 2>&1; then
export TERM=xterm-256color
fi
export HISTTIMEFORMAT='%F %T '
export PAGER='less -XFr'
export GITPAGER='less -XFr'

Some files were not shown because too many files have changed in this diff Show More