diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-12-06 23:46:26 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-12-06 23:46:26 -0500 |
| commit | b407de3877656b18705c6272d07284821baa69f5 (patch) | |
| tree | 457ce6388af783cc20061eef1581119e2c542b13 | |
| parent | 9685060a9222ae5bdc242c6366f4a074e5ad8589 (diff) | |
| parent | f189b197d568df8555a7de1e08f7f05665f708ba (diff) | |
Merge branch 'master' into build64-par/master
| -rw-r--r-- | .config/emacs/custom.el | 8 | ||||
| -rw-r--r-- | .config/emacs/init.el | 4 | ||||
| -rw-r--r-- | .config/login.d/02_xdg_runtime_dir.sh | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 55af402..a33c87f 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -31,10 +31,18 @@ (quote ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f"))) '(org-src-fontify-natively t) + '(ruby-deep-arglist nil) + '(ruby-deep-indent-paren nil) + '(safe-local-variable-values + (quote + ((Nginx-indent-tabs-mode) + (Nginx-indent-level . 4) + (Nginx-indent-level . 8)))) '(scroll-bar-mode nil) '(send-mail-function (quote smtpmail-send-it)) '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") '(smtpmail-smtp-service 587) + '(tramp-use-ssh-controlmaster-options nil) '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 38f6e77..d102269 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -105,6 +105,7 @@ (set (make-local-variable 'tab-width) 2) (set (make-local-variable 'indent-tabs-mode) nil) ))) + (:name go-mode :type elpa) (:name graphviz-dot-mode :type elpa) (:name haml-mode :type elpa) (:name markdown-mode :type elpa @@ -112,7 +113,7 @@ (:name nginx-mode :type elpa :after (put 'nginx-indent-level 'safe-local-variable 'integerp)) (:name scss-mode :type elpa) - (:name go-mode :type elpa) + (:name yaml-mode :type elpa) )) ;; What packages el-get should install, both from above, and it's ;; internal list of sources. @@ -138,6 +139,7 @@ nginx-mode php-mode-improved scss-mode + yaml-mode ))) diff --git a/.config/login.d/02_xdg_runtime_dir.sh b/.config/login.d/02_xdg_runtime_dir.sh index 6db58af..6e3e4ad 100644 --- a/.config/login.d/02_xdg_runtime_dir.sh +++ b/.config/login.d/02_xdg_runtime_dir.sh @@ -5,11 +5,11 @@ if [ -z "$XDG_RUNTIME_DIR" ] && type flock &>/dev/null; then _diy_xdg_runtime_login() { export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME" if ! [ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]; then + mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" if flock -xn 7; then if [ ! -d "$XDG_RUNTIME_DIR" ]; then local tmp="$(mktemp -d --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")" - mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR" fi # Unfortunately this doesn't survive across exec(1). @@ -19,7 +19,6 @@ if [ -z "$XDG_RUNTIME_DIR" ] && type flock &>/dev/null; then fi } _diy_xdg_runtime_logout() { - exec 7>&- exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" if flock -xn 7; then rm -rf -- "$(readlink "$XDG_RUNTIME_DIR")" |