all repos — nixfiles @ c8dfdd15c8712ff5ca24dc713b585e9a568adbdb

System and user configuration, managed by nix and home-manager

Merge branch 'master' of server.home:dotfiles
Alan Pearce alan@alanpearce.co.uk
Mon, 02 Sep 2013 21:21:08 +0100
commit

c8dfdd15c8712ff5ca24dc713b585e9a568adbdb

parent

4995c1c2200c7ca5c20a1de0aad3f8a465fb911d

3 files changed, 38 insertions(+), 3 deletions(-)

jump to
M emacs/init.el → emacs/init.el
@@ -539,7 +539,9 @@ :config (progn             (ido-mode 1)
             (setq ido-decorations (quote ("\n›" "" "\n " "\n …" "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]")))
             (setq ido-auto-merge-delay-time 99999
-                  ido-enable-flex-matching t)
+                  ido-enable-flex-matching t
+                  ido-save-directory-list-file (expand-file-name user-emacs-directory
+                                                                 "ido-state"))
             (ido-init-completion-maps)
             (defun ido-manual-merge ()
               (interactive)
@@ -557,13 +559,13 @@ :config (progn             (setq smex-history-length 100
                   smex-save-file (concat user-emacs-directory
                                          "smex-items"))
-            (smex-initialize)
             (setq smex-key-advice-ignore-menu-bar t
                   smex-auto-update nil)
             (defun smex-update-after-load (unused)
               (if (boundp 'smex-cache)
                   (smex-update)))
-            (add-hook 'after-load-functions 'smex-update-after-load)))
+            (add-hook 'after-load-functions 'smex-update-after-load))
+  :init (smex-initialize))
 
 ;;;; Modeline
 
@@ -1167,6 +1169,14 @@ (use-package sgml-mode
   :defer t
   :config (setq sgml-basic-offset 4))
+
+(use-package web-mode
+  :defer t
+  :mode (("/views/.*\\.php\\'" . web-mode)
+         ("/templates/.*\\.php\\'" . web-mode))
+  :config (setq web-mode-code-indent-offset 4
+                web-mode-css-indent-offset 4
+                web-mode-markup-indent-offset 4))
 
 ;;;; Windows & Frames
M gitconfig → gitconfig
@@ -21,3 +21,5 @@ [github] 	user = alan@alanpearce.co.uk
 [diff]
 	algorithm = patience
+[core]
+	excludesfile = /Users/alan/dotfiles/global.gitignore
A global.gitignore
@@ -0,0 +1,23 @@+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+Desktop.ini
+
+# Thumbnails
+._*
+Thumbs.db
+
+# Emacs
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive