Commit graph

46 commits

Author SHA1 Message Date
934d02bcac Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
	.config/awesome/rc.lua
	.emacs.d/init.el
	.emacs.d/init.org
	.emacs.d/site-lisp/oni.el
2013-02-15 15:37:42 +01:00
1d1f51db69 emacs: Add button to show special org file 2013-02-15 00:36:22 +01:00
214e1ed72b emacs: Start auto-complete after init
Since the load paths for ELPA-installed packages doesn't get set-up
until after the init file has loaded, defer loading and enabling of
auto-complete to after initializations.
2013-02-15 00:33:57 +01:00
111e229676 emacs: Use modern indentation for Haskell code 2013-02-15 00:32:41 +01:00
c3aa5bb8b4 emacs: Use flycheck for python 2013-02-06 11:48:25 +01:00
9cd4c8ed8c emacs: Move flymake settings to init.org 2013-02-02 01:08:59 +01:00
8fddc0d0a7 emacs: Move EMMS settings to init.org 2013-02-02 00:56:32 +01:00
9223d0e998 emacs: Remove some mu4e settings 2013-02-01 12:27:26 +01:00
d93fdf8470 emacs: The return of fill-column-indicator 2013-02-01 12:26:09 +01:00
7d719f694b Move eshell settings to org 2013-01-28 00:43:57 +01:00
35fc2e3378 emacs: Redo again 2013-01-25 00:32:30 +01:00
521ef4749f Emacs: Cleanup `eval-after-load's
Also set `sentence-end-double-space' to nil so I don't have to use
double spaces to end a sentence and keep the fill functions happy.
2013-01-16 01:30:00 +01:00
7a5a232c27 Emacs: Update some things 2013-01-15 12:11:41 +01:00
12fbc83cc7 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/init.el
2013-01-04 00:06:15 +01:00
4cf76b65c1 Emacs: Stay true to 80 columns, even with lisp 2013-01-04 00:00:37 +01:00
430729835b Emacs: Autofill everything in Texinfo
Not just comments
2012-12-30 02:31:16 +01:00
abc2720206 Use fci-rule-column, not fci-column 2012-12-23 12:52:18 +01:00
25adcab0c3 Set the fci-rule-column to 101 for lisps 2012-12-19 11:43:00 +01:00
19cc94fc81 Only make TAGS when TAGS target available
The "(Shell command failed with code 2 and no output)" was starting to
drive me nuts.

* .emacs.d/site-lisp/oni.el (oni:after-save-func): Check if there is a
  `TAGS:' target in the found makefile before trying to make.
2012-12-19 11:29:46 +01:00
c8b34bbdad Remove oni:load-hippie-exp
Placing `yas/hippie-try-expand' at the end of the
`hippie-expand-try-functions-list' doesn't seem to work very well and
putting it in the front might cause situations where I want to expand
a variable name or something and yas might take over, so don't use yas
with hippie-expand.  Instead bind `yas-expand' to `C-\' and set
`yas-fallback-behavior' to nil so it doesn't start acting crazy when
there's no snippet to expand.
2012-12-17 12:11:03 +01:00
5cff0a1e09 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	dotfiles.mk
2012-12-14 00:32:05 +01:00
614fcffbb7 Send jabber message as appt reminders 2012-12-06 22:40:43 +01:00
1e84d8bee4 Change prompts for jabber
This way all text is nicely alligned
2012-12-06 13:04:29 +01:00
6278e2e634 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-12-05 00:44:09 +01:00
ac510449fc .emacs.d/site-lisp/oni.el 2012-12-04 17:45:20 +01:00
bb9e6aab9d .emacs.d/site-lisp/oni.el 2012-11-28 10:13:49 +01:00
92eba9c869 .emacs.d/site-lisp/oni.el 2012-11-27 11:12:59 +01:00
fa717d86a0 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-21 01:23:32 +01:00
e2ed387df1 .emacs.d/site-lisp/oni.el 2012-11-20 18:53:43 +01:00
07be108b4e .emacs.d/site-lisp/oni.el 2012-11-19 23:23:13 +01:00
9c12ab5718 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-14 20:12:55 +01:00
5abfdc6b5c .emacs.d/site-lisp/oni.el 2012-11-14 20:05:27 +01:00
ec37bc37ca .emacs.d/site-lisp/oni.el 2012-11-14 01:23:05 +01:00
57e1063403 .config/herbstluftwm/autostart 2012-11-08 00:34:15 +01:00
96b2ebe6e8 .emacs.d/site-lisp/oni.el 2012-11-08 00:30:19 +01:00
2490c4a89c .emacs.d/site-lisp/oni.el 2012-11-05 21:04:56 +01:00
cbdfa4cac3 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-10-26 01:46:09 +02:00
8136125d18 .emacs.d/site-lisp/oni.el 2012-10-26 00:52:39 +02:00
d6be1ae80f Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
	.xinitrc
	.zprofile
2012-10-24 01:36:38 +02:00
f0daa3f3cf .emacs.d/site-lisp/oni.el 2012-10-22 23:59:18 +02:00
1f67da1508 .emacs.d/site-lisp/oni.el 2012-10-18 11:11:05 +02:00
a38c6eee1a .emacs.d/site-lisp/oni.el 2012-10-17 09:04:32 +02:00
821793e7de Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.xinitrc
2012-10-17 08:48:46 +02:00
e3a2616488 .emacs.d/site-lisp/oni.el 2012-10-17 00:38:18 +02:00
0c6b068a8f .emacs.d/site-lisp/oni.el 2012-10-16 10:04:32 +02:00
838fc8289c .emacs.d/site-lisp/oni.el 2012-10-11 21:23:13 +02:00