From 94ab675f400ca76e1c45376393bcf974579caacb Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 25 Aug 2013 19:32:23 +0100 Subject: Emacs: save ido state file in emacs directory --- emacs/init.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index d142da4..f15386f 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -529,7 +529,9 @@ Values: `desktop', `server', `laptop'") (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) -- cgit 1.4.1 From 8214342af8a51b9ed63d9bea27cbf7b8051f0b4b Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 2 Sep 2013 09:29:29 +0100 Subject: Emacs: setup web-mode --- emacs/init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/emacs/init.el b/emacs/init.el index c26d142..2d80bc8 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1170,6 +1170,14 @@ Works with: arglist-cont-nonempty, arglist-close." :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 (setq frame-title-format -- cgit 1.4.1 From c0b1db9dd382dfa75980888433936645ac17bf97 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 2 Sep 2013 09:32:58 +0100 Subject: Emacs: initialise smex on startup for faster usage --- emacs/init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 2d80bc8..337d663 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -559,13 +559,13 @@ Values: `desktop', `server', `laptop'") (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 -- cgit 1.4.1 From 13ddd4cb0f91cb6c78f94eb5fa8bbee1b5b83920 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 2 Sep 2013 13:32:47 +0100 Subject: Add global gitignore file --- gitconfig | 2 ++ global.gitignore | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 global.gitignore diff --git a/gitconfig b/gitconfig index 0e4d5af..9d61670 100644 --- a/gitconfig +++ b/gitconfig @@ -21,3 +21,5 @@ user = alan@alanpearce.co.uk [diff] algorithm = patience +[core] + excludesfile = /Users/alan/dotfiles/global.gitignore diff --git a/global.gitignore b/global.gitignore new file mode 100644 index 0000000..02b15bf --- /dev/null +++ b/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 \ No newline at end of file -- cgit 1.4.1