summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
Commit message (Collapse)AuthorAgeFilesLines
* Update dotfilesphoenixGravatar Tom Willemse2013-05-151-312/+0
|
* Merge remote-tracking branch 'ryuslash/master' into phoenixGravatar Tom Willemsen2013-02-151-162/+59
|\ | | | | | | | | | | | | | | Conflicts: .config/awesome/rc.lua .emacs.d/init.el .emacs.d/init.org .emacs.d/site-lisp/oni.el
| * emacs: Add button to show special org fileGravatar Tom Willemsen2013-02-151-0/+1
| |
| * emacs: Make frames transparentGravatar Tom Willemsen2013-02-151-1/+2
| |
| * emacs: Start auto-complete after initGravatar Tom Willemsen2013-02-151-0/+1
| | | | | | | | | | | | 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.
| * emacs: Use modern indentation for Haskell codeGravatar Tom Willemsen2013-02-151-0/+1
| |
| * emacs: Move flymake settings to init.orgGravatar Tom Willemsen2013-02-021-48/+0
| |
| * emacs: Move EMMS settings to init.orgGravatar Tom Willemsen2013-02-021-7/+0
| |
| * emacs: remove quick-edit-modeGravatar Tom Willemsen2013-02-011-3/+0
| | | | | | | | Haven't been using it
| * emacs: Rearrange some keybindingsGravatar Tom Willemsen2013-02-011-5/+5
| | | | | | | | I used sort-lines on them
| * emacs: Change some jabber settingsGravatar Tom Willemsen2013-02-011-4/+4
| |
| * Change font to Envy Code RGravatar Tom Willemsen2013-02-011-1/+1
| |
| * Emacs: increase font sizeGravatar Tom Willemsen2013-01-291-1/+1
| |
| * Move eshell settings to orgGravatar Tom Willemsen2013-01-281-6/+0
| |
| * Move eldoc settings to orgGravatar Tom Willemsen2013-01-281-1/+0
| |
| * emacs: Redo againGravatar Tom Willemsen2013-01-251-19/+47
| |
| * Emacs, Xdefaults: Change font back to MonacoGravatar Tom Willemsen2013-01-171-1/+1
| | | | | | | | | | | | Consolas may have cursive script, but it also has crazy changing letters for each scrept (bold, cursive). And Monaco still has the better parentheses.
| * Emacs: Cleanup `eval-after-load'sGravatar Tom Willemsen2013-01-161-65/+10
| | | | | | | | | | 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.
| * Emacs: Update some thingsGravatar Tom Willemsen2013-01-151-8/+18
| |
| * Emacs: Move some more things to init.orgGravatar Tom Willemsen2013-01-041-6/+0
| |
| * Emacs: fix typoGravatar Tom Willemsen2013-01-041-1/+1
| |
| * Emacs: move some stuff to init.orgGravatar Tom Willemsen2013-01-041-22/+0
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2013-01-041-53/+27
|\| | | | | | | | | Conflicts: .emacs.d/init.el
| * Emacs: Don't load rudel for nowGravatar Tom Willemsen2013-01-041-1/+1
| | | | | | | | I haven't used it in a while anyway...
| * Emacs: Show any scratch buffers in current windowGravatar Tom Willemsen2013-01-041-0/+3
| |
| * Emacs: Stay true to 80 columns, even with lispGravatar Tom Willemsen2013-01-041-3/+0
| |
| * Emacs: don't use ido for `org-refile'Gravatar Tom Willemsen2013-01-041-0/+1
| | | | | | | | It doesn't work...
| * Emacs: Some mode changesGravatar Tom Willemsen2013-01-031-3/+4
| | | | | | | | | | | | * .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.
| * Emacs: Start with literate configuration againGravatar Tom Willemsen2013-01-031-39/+1
| |
| * Emacs: Stop using ido-ubiquitousGravatar Tom Willemsen2012-12-301-2/+1
| | | | | | | | | | It was starting to get in the way too much, try icomplete-mode instead.
| * Emacs: Show magit main window in current windowGravatar Tom Willemsen2012-12-281-0/+3
| |
| * Emacs: set-up auto-complete default configGravatar Tom Willemsen2012-12-281-0/+1
| |
| * Emacs: Reset buffer displayGravatar Tom Willemsen2012-12-281-3/+0
| | | | | | | | | | Having everything show up in the same buffer is unpleasant, the correct situation should be determined per-buffer.
| * Emacs: Manually set-up w3mGravatar Tom Willemsen2012-12-281-1/+2
| | | | | | | | | | Only `w3m-goto-url' and `w3m-bookmark-view' are ever really used to start w3m, no need to load `w3m-load' for that.
| * Emacs: Throw away unneeded imports and sortGravatar Tom Willemsen2012-12-271-6/+3
| |
| * Emacs: Meh, stop messing around with the mode-lineGravatar Tom Willemsen2012-12-271-2/+0
| |
| * Show buffer position againGravatar Tom Willemsen2012-12-201-1/+0
| |
| * Emacs: diminish yasnippetGravatar Tom Willemsen2012-12-201-0/+3
| |
| * Add diminishGravatar Tom Willemsen2012-12-191-0/+11
| |
| * Set the fci-rule-column to 101 for lispsGravatar Tom Willemsen2012-12-191-0/+3
| |
| * Remove oni:load-hippie-expGravatar Tom Willemsen2012-12-171-6/+1
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-12-141-4/+16
|\| | | | | | | | | Conflicts: dotfiles.mk
| * Add type-break settingsGravatar Tom Willemsen2012-12-141-1/+4
| |
| * Emacs: Simplify window management keysGravatar Tom Willemsen2012-12-111-0/+5
| | | | | | | | | | | | 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...
| * Add the external yoshi-theme path to theme pathGravatar Tom Willemsen2012-12-111-1/+4
| |
| * Send jabber message as appt remindersGravatar Tom Willemsen2012-12-061-0/+1
| |
| * Change prompts for jabberGravatar Tom Willemsen2012-12-061-2/+2
| | | | | | | | This way all text is nicely alligned
* | There is no /usr/local/emacs hereGravatar Tom Willemsen2012-12-051-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-12-051-31/+41
|\| | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-12-041-20/+24
| |