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
ba12781a86
emacs: Make frames transparent
2013-02-15 00:34:54 +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
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
cf22ea29f2
emacs: remove quick-edit-mode
...
Haven't been using it
2013-02-01 12:25:36 +01:00
7c3a731232
emacs: Rearrange some keybindings
...
I used sort-lines on them
2013-02-01 12:25:18 +01:00
930e307a41
emacs: Change some jabber settings
2013-02-01 12:23:16 +01:00
c8f930e4c9
Change font to Envy Code R
2013-02-01 12:22:13 +01:00
a89de59d03
Emacs: increase font size
2013-01-29 02:36:09 +01:00
7d719f694b
Move eshell settings to org
2013-01-28 00:43:57 +01:00
5a1e9f2ea8
Move eldoc settings to org
2013-01-28 00:18:29 +01:00
35fc2e3378
emacs: Redo again
2013-01-25 00:32:30 +01:00
454fe03fdc
Emacs, Xdefaults: Change font back to Monaco
...
Consolas may have cursive script, but it also has crazy changing
letters for each scrept (bold, cursive). And Monaco still has the
better parentheses.
2013-01-17 14:51:20 +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
f10f2a2382
Emacs: Move some more things to init.org
2013-01-04 02:08:31 +01:00
4ce6139824
Emacs: fix typo
2013-01-04 01:33:31 +01:00
5014e72d7e
Emacs: move some stuff to init.org
2013-01-04 01:33:09 +01:00
12fbc83cc7
Merge remote-tracking branch 'origin/master' into phoenix
...
Conflicts:
.emacs.d/init.el
2013-01-04 00:06:15 +01:00
a13dbcec8d
Emacs: Don't load rudel for now
...
I haven't used it in a while anyway...
2013-01-04 00:01:29 +01:00
454f5cd77e
Emacs: Show any scratch buffers in current window
2013-01-04 00:01:08 +01:00
4cf76b65c1
Emacs: Stay true to 80 columns, even with lisp
2013-01-04 00:00:37 +01:00
241374103f
Emacs: don't use ido for `org-refile'
...
It doesn't work...
2013-01-04 00:00:08 +01:00
8e738db1fa
Emacs: Some mode changes
...
* .emacs.d/init.el: Reorder modes. Start using `winner-mode' again
and once more prefer `ido-ubiquitous' over `icomplete-mode'.
`icomplete-mode' tends to get messy.
2013-01-03 23:59:26 +01:00
5b4684f335
Emacs: Start with literate configuration again
2013-01-03 23:55:57 +01:00
0cceaba810
Emacs: Stop using ido-ubiquitous
...
It was starting to get in the way too much, try icomplete-mode
instead.
2012-12-30 02:29:29 +01:00
eda4b0c1ef
Emacs: Show magit main window in current window
2012-12-28 11:24:28 +01:00
d29d60a998
Emacs: set-up auto-complete default config
2012-12-28 01:58:23 +01:00
71eaad3446
Emacs: Reset buffer display
...
Having everything show up in the same buffer is unpleasant, the
correct situation should be determined per-buffer.
2012-12-28 01:58:05 +01:00
62ea1086e9
Emacs: Manually set-up w3m
...
Only `w3m-goto-url' and `w3m-bookmark-view' are ever really used to
start w3m, no need to load `w3m-load' for that.
2012-12-28 01:56:58 +01:00
5d78178216
Emacs: Throw away unneeded imports and sort
2012-12-27 02:26:02 +01:00
172fcfe930
Emacs: Meh, stop messing around with the mode-line
2012-12-27 02:25:29 +01:00
e6036a3382
Show buffer position again
2012-12-20 00:15:28 +01:00
43382b4e45
Emacs: diminish yasnippet
2012-12-20 00:01:55 +01:00
adf44fafae
Add diminish
2012-12-19 23:55:48 +01:00
25adcab0c3
Set the fci-rule-column to 101 for lisps
2012-12-19 11:43:00 +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
58dc871d0b
Add type-break settings
2012-12-14 00:16:57 +01:00
0195a2c07c
Emacs: Simplify window management keys
...
Since `C-1..9' do the same as `M-1..9' and I never use the Meta ones,
I seem to have a few keybindings available to me for such things as
this. Now I just need to start using them...
2012-12-11 01:46:16 +01:00
757a5fab18
Add the external yoshi-theme path to theme path
2012-12-11 01:44:49 +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
a95c1528ab
There is no /usr/local/emacs here
2012-12-05 00:47:40 +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
ff77b0c0d9
.emacs.d/init.el
2012-12-04 17:41:57 +01:00
7dc3ebbcc1
.emacs.d/init.el
2012-11-27 11:12:17 +01:00
