X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=63bfcfa57c424071fad509f6b8095d5e07e9d383;hb=7867ad02e3b851de019695a0c4606d44551aa4c9;hp=01c8b7b202eb7c7f3d2259b900cd9770ec1ebd50;hpb=c1aa3d72d715c7c7cc1e5dea3342230aed4b38b4;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 01c8b7b..63bfcfa 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -161,20 +161,34 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
-;; session
-(require-if-present 'session)
+;; ditz
+(require-if-present 'ditz)
 
 ;; flyspell
 (require-if-present 'flyspell)
 
-;; ditz
-(require-if-present 'ditz)
+;; jaspace
+(require-if-present 'jaspace)
+
+;; glsl
+(autoload 'glsl-mode "glsl-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.vert\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
+
+;; rust
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+
+;; session
+(require-if-present 'session)
 
 ;; mediawiki
 (require-if-present 'mediawiki)
 
-;; jaspace
-(require-if-present 'jaspace)
+;; midnight
+(require-if-present 'midnight)
 
 ;; color-theme
 (require-if-present 'color-theme)
@@ -422,10 +436,6 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq cperl-indent-level 4)
 (setq cperl-indent-parens-as-block t)
 
-;; Lua
-(autoload 'lua-mode "lua-mode" "Lua Mode" t)
-(add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-mode))
-
 ;; Erlang
 (require-if-present 'erlang-start)
 (setq erlang-electric-commands nil)
@@ -571,6 +581,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(appt-message-warning-time 20)
  '(browse-url-browser-function (quote browse-url-firefox))
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
+ '(clean-buffer-list-delay-general 7)
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
  '(compilation-scroll-output (quote first-error))
@@ -618,6 +629,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(js2-indent-on-enter-key nil)
  '(js2-mirror-mode nil)
  '(js2-use-font-lock-faces t)
+ '(lua-indent-level 4)
  '(makefile-mode-hook (quote ((lambda nil (set-variable (quote tab-width) 8)))))
  '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist
@@ -680,6 +692,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      (30 subj)
      "|"
      (0 body))))
+ '(midnight-mode t)
  '(mouse-wheel-progessive-speed nil)
  '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control)))))
  '(mpc-browser-tags