Stuff

2 files changed, 27 insertions, 4 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index a099221..ac20ba1 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -33,11 +33,30 @@
    (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)
+ '(package-selected-packages
+   (quote
+    (wanderlust yaml-mode scss-mode nginx-mode markdown-mode less-css-mode haml-mode graphviz-dot-mode go-mode glsl-mode php-mode php-mode-improved coffee-mode bison-mode smart-tabs-mode page-break-lines dtrt-indent)))
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values
    (quote
-    ((Nginx-indent-tabs-mode)
+    ((Fill-Column . 64)
+     (eval c-set-offset
+           (quote arglist-close)
+           0)
+     (eval c-set-offset
+           (quote arglist-intro)
+           (quote ++))
+     (eval c-set-offset
+           (quote case-label)
+           0)
+     (eval c-set-offset
+           (quote statement-case-open)
+           0)
+     (eval c-set-offset
+           (quote substatement-open)
+           0)
+     (Nginx-indent-tabs-mode)
      (Nginx-indent-level . 4)
      (Nginx-indent-level . 8)
      (c-set-style . "K&R"))))
@@ -46,7 +65,8 @@
  '(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)))
+ '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify))
+ '(use-package-verbose (quote debug)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 8d8859e..b7ee6df 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -13,10 +13,12 @@
  elmo-cache-directory         (concat xdg-cache-home "emacs/elmo-cache/")
  auto-save-list-file-prefix   (concat xdg-cache-home "emacs/auto-save-list/saves-")
  tramp-persistency-file-name  (concat xdg-cache-home "emacs/tramp-cache.el")
- custom-file                  (concat user-emacs-directory "custom.el")
  wl-init-file                 (concat user-emacs-directory "wl.el")
  )
 
+(setq custom-file (concat user-emacs-directory "custom.el"))
+(load custom-file 'noerror)
+
 ;;;; The basics that I can't use Emacs without ;;;;;;;;;;;;;;;;;;;;;;;
 (show-paren-mode 1)
 (column-number-mode 1)
@@ -36,7 +38,6 @@
       point-entered minibuffer-avoid-prompt
       face minibuffer-prompt
       ))
-(load custom-file 'noerror)
 
 
 ;;;; Early settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -299,5 +300,7 @@ sh-script.el is broken."
 
 (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
 (add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode))
+(add-to-list 'auto-mode-alist '("\\.mak\\'" . makefile-gmake-mode))
 (add-to-list 'auto-mode-alist '("\\.jad\\'" . java-mode))
+
 (put 'downcase-region 'disabled nil)