Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump emacs.d from c8de34f to af41e17 #5

Open
wants to merge 194 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
b2d0c1a
add my bin folder
marten Jun 2, 2012
268ba9d
Update README.md
marten Jun 2, 2012
7425ff1
Init emacs.d customizations (el-get, a decent colourscheme, very basi…
marten Apr 22, 2012
69a4f11
Add gitigore to ignore el-get and other auto-generated stuff
marten Apr 22, 2012
aee7bb5
Rename "global" to "init"
marten Apr 22, 2012
5fd71c7
Move packages out into their own file.
marten Apr 22, 2012
535cc80
Add a bunch more core tweaks
marten Apr 22, 2012
4fd986c
Set Evil default mode for dired to emacs mode
marten Apr 22, 2012
a83e42b
Add README
marten Apr 22, 2012
3c9dab8
Set default mode for Magit's commit screen to Emacs
marten Apr 22, 2012
8bca86a
Update README.markdown
marten Apr 22, 2012
03a3bc3
Add peepopen for MacOSX
marten Apr 23, 2012
1de61a6
updates
marten May 14, 2012
44e484f
Add keybindings for zooming text in buffer
marten May 14, 2012
453889d
add auctex, autoremove trailing whitespace
marten May 21, 2012
8b138c4
add custom settings
marten Jun 2, 2012
3208e94
Remove session files
marten Jun 2, 2012
9f73413
prepare for merge to dotfiles.git
marten Jun 2, 2012
5e455bd
move emacs to symlinked dir
marten Jun 2, 2012
6adf7ae
Updated emacs readme
marten Jun 2, 2012
9724cb4
add ack and mr configs
marten Jun 2, 2012
50d4edf
add x11 config files
marten Jun 2, 2012
6dd6113
Updates to zsh modularity
marten Jun 3, 2012
7b07efd
Played around with ST2 today, here's some config
marten Jun 3, 2012
81385a8
ignore license file
marten Jun 3, 2012
e583c71
use opendiff for git
marten Jun 4, 2012
777cee9
add authorized keys
marten Jun 4, 2012
7767431
update ST2
marten Jun 4, 2012
88f171e
add gemrc irbrc
marten Jun 4, 2012
1e544b4
sublime updates
marten Jun 4, 2012
bf23ee9
update sublime
marten Jun 23, 2012
77252f5
add pdfcropper to same file as input
marten Jun 23, 2012
1ebb279
fix vundle
marten Jul 2, 2012
a0a9b80
Remove sublimestuff that does not belong in repo
marten Jul 6, 2012
b17fde7
update sublime settings
marten Jul 6, 2012
cd66819
Re-add bin to front of PATH
marten Jul 6, 2012
5fe64f6
Some vimrc re-organization
marten Jul 6, 2012
4a8499f
remove more sublime stuff
marten Jul 6, 2012
3349f39
ignore a whole slew of sublime stuff
marten Jul 6, 2012
ff4b420
Merge remote-tracking branch 'origin/master'
marten Jul 6, 2012
d278aa7
Add vim-turbux, remove subl, update ssh config.
marten Jul 16, 2012
b740d3b
also counts _test as tests
marten Jul 16, 2012
5a7ee31
update to leiningen 2
marten Jul 16, 2012
8aaec7a
vim updates for test files
marten Jul 23, 2012
b45eca8
fix sublime settings
marten Jul 27, 2012
2276974
update subl
marten Aug 14, 2012
b39aec9
Update dotfiles
marten Oct 16, 2012
3e1e97b
updates
marten Oct 16, 2012
4743a59
Update vim/vimrc.symlink
marten Nov 30, 2012
d8cc44f
fix rvm loading in new windows
marten Oct 17, 2012
8c092b5
Add markdown config for ack
marten Dec 18, 2012
3046402
set kaleidoscope as diff tool
marten Dec 18, 2012
6c1e5a4
Update ssh config
marten Dec 18, 2012
12e3a42
Update mr config
marten Dec 18, 2012
0dd5fb9
disable turbux
marten Dec 18, 2012
51407bf
Use global soundcheck instead of custom dev version
marten Dec 18, 2012
32d97e3
Add git aliasses
marten Dec 18, 2012
08260a8
Update sublime settings
marten Dec 18, 2012
7d40cc6
add chef to mr, fix vimrc for homebrew vim
marten Dec 18, 2012
d89ccc2
Update kaleidoscope git config
marten Jan 21, 2013
8917aa5
Autostrip trailing whitespace
marten Jan 21, 2013
3a255b9
Update ip for Jenkins
marten Jan 21, 2013
5e70fd8
Sublime settings tweaks
marten Jan 21, 2013
3a4b620
Fix completions for newer brewed zsh
marten Feb 26, 2013
4cf12dc
Update kaleidoscope difftool integration
marten Feb 26, 2013
66e56fc
Remove pbcopy/paste wrappers for Linux
marten Feb 26, 2013
d805b47
export Roqua root path
marten Feb 26, 2013
58fc9f7
remove duo api key
marten Feb 26, 2013
b013bd0
Update x0ci host to point at blan ip
marten Feb 26, 2013
d2b41c7
Update sublime settings
marten Feb 26, 2013
3bfb262
Add roqua-support to mr
marten Feb 26, 2013
4d063af
add dsstore to ignore
marten Feb 26, 2013
d50748e
Merge branch 'master' of github.com:marten/dotfiles
marten Feb 26, 2013
0b48cd4
add authmac
marten Feb 26, 2013
73b66e9
updates
marten May 1, 2013
43f72ed
reenable nerdtree
marten May 18, 2013
c0253f9
updates
marten May 18, 2013
b6f9f7c
Merge branch 'master' of github.com:marten/dotfiles
marten May 18, 2013
9935d98
update dotifles
marten May 28, 2013
d1b9634
add rubocop to syntastic
marten Jun 5, 2013
43a7470
update
marten Jun 5, 2013
7fcd367
update
marten Jul 16, 2013
a82bce5
update from air
marten Jul 16, 2013
dcde6fa
Add sublime text 3 dir
marten Jul 16, 2013
2d57b04
update git config
marten Oct 5, 2013
41f654e
disable ruby syntax checker in vim, too slow
marten Oct 5, 2013
605ea19
add subl3 preferences
marten Oct 5, 2013
eb6133c
Update Emacs
marten Nov 5, 2013
d76cb2f
Fix chruby not complaining when not installed
marten Nov 5, 2013
3fdbb37
update emacs
marten Nov 5, 2013
123f797
Add dash-at-point and highlight-indentation
marten Nov 5, 2013
4ba7216
Merge commit '721833dc4ae28ebb980e5f22df3a56deaa1931bf' as 'emacs/ema…
marten Nov 5, 2013
d5fbe01
Add powerline, key bindings, fixes for evil-mode
marten Nov 5, 2013
5283373
add stuff
marten Nov 5, 2013
11f08f0
Merge commit 'e7c0212f74f2c4a1c707ef49fafcedabcfe57fc3' as 'emacs/ema…
marten Nov 5, 2013
06dc5ee
add and configure smartparens
marten Nov 5, 2013
fe53d4d
Add rake deps to install emacs deps
marten Nov 6, 2013
31f594e
remove grizzl
marten Nov 6, 2013
f51dead
Add grizzl correctly
marten Nov 6, 2013
dfc8b07
remove dsstore
marten Nov 6, 2013
d38c6da
Reopen files on Emacs reboot
marten Nov 6, 2013
a3ce7f8
Add NERD commenter
marten Nov 6, 2013
08f59b5
remove projectile generated files from git
marten Nov 6, 2013
bc215e0
Remove tramp file from git
marten Nov 6, 2013
322b02c
Fix home/end keys not being what my mind expects
marten Nov 6, 2013
2e7e37f
Add SHARPEN.md file with annoyances
marten Nov 6, 2013
a291459
Update projectile config for dotfiles, remove unused configs
marten Nov 6, 2013
40db197
Add monokai
marten Nov 7, 2013
ca2c369
disable nerdcommenter
marten Nov 7, 2013
6b06749
Updates to emacs config
marten Nov 15, 2013
85eee12
Add coffee-mode
marten Nov 18, 2013
81e977d
Add homebrew pip binaries to PATH
marten Nov 18, 2013
045f608
fix coffee-mode
marten Nov 18, 2013
a2a00b9
Add git reflow config
marten Nov 19, 2013
c456990
Update gitconfig.symlink
marten Dec 3, 2013
9d9f009
updates
marten Jan 7, 2014
5c6fd3d
Update dotfiles for new machien
marten Mar 11, 2014
0302401
Add vundle
marten Mar 11, 2014
0ad9c1a
Add more packages to brewfile
marten Mar 11, 2014
dcfc288
Updates to dotfiles
marten Mar 20, 2014
62a40b8
updates
marten Mar 26, 2014
c97ee5e
updaet
marten Apr 7, 2014
7b02abd
Update SHARPEN.md
marten Apr 8, 2014
b6938c7
Update emacs config
marten Jun 14, 2014
fc12452
Update configs
marten Jun 14, 2014
8314100
Update emacs config
marten Jun 15, 2014
1453017
updates
marten Jun 15, 2014
0de354e
Update emacs config
marten Jun 22, 2014
ce26868
Ignore github-for-mac ssh key
marten Jun 22, 2014
7fee811
Write backups to ~/.emacs.d/backups; Add magit
marten Jun 22, 2014
947e1cb
Remove elpa
marten Jun 23, 2014
da18247
Updates
marten Sep 9, 2014
f5985c2
add coffeescript for emacs
marten Sep 9, 2014
2046329
Updates
marten Mar 3, 2015
70dc27d
Updates
marten Mar 24, 2015
1b1175e
Merge remote-tracking branch 'origin/master'
marten Mar 24, 2015
93e7b0e
move emacs config
marten Mar 24, 2015
eda846c
foobar
marten Mar 24, 2015
5d68df6
updates
marten Mar 24, 2015
22d5ac6
Add whitespace layer
marten Mar 24, 2015
3d0ec56
Switch to rvm
marten May 22, 2015
96bf7f7
Add OSX and Clojure layers
marten May 22, 2015
f6bd12c
Upgrade spacemacs
marten Jun 8, 2015
ce4b089
Set zsh for shell
marten Jun 10, 2015
ca4b198
Fix readline issues, add docker env vars to zsh
marten Jun 17, 2015
af897de
add direnv and iterm2-emacs
marten Aug 5, 2015
4ab9a76
update brewfile etc
marten Aug 18, 2015
112e7ba
Updates
marten Mar 3, 2016
2722047
add config dir
marten Mar 3, 2016
3912160
Add neovim
marten Mar 8, 2016
da37dd1
backport clearing trailing newlines to normal vim
marten Mar 8, 2016
69bb1c5
Updates
marten Jul 12, 2016
24bea13
nvim: replace ctrlp with unite
marten Jul 15, 2016
2d594f4
add beheer11 for sshuttle
marten Feb 26, 2017
5c4460c
remove nvm, switch to asdf
marten Jun 23, 2017
7824715
Fix Linux compat
marten Aug 7, 2017
3c172af
Merge branch 'master' of github.com:marten/dotfiles
marten Aug 7, 2017
69ae3ce
update stuff
marten Sep 5, 2017
bcdbdd5
add spacemacs config
marten Sep 5, 2017
165a8ce
updates
marten Sep 5, 2017
a28c889
merge two spacemacs configs
marten Sep 5, 2017
67cc4cf
move old config
marten Sep 5, 2017
43e45a7
persistent iex history
marten Sep 25, 2017
9a14c53
UPdates
marten Nov 20, 2017
f4f6a17
update spacemacs
marten Oct 3, 2017
d39076e
Add Rust and Crystal, update to newer Spacemacs, remove my-whitespace…
marten Feb 9, 2018
bfb1db3
Use gnome keyring
marten Feb 9, 2018
aa69442
Various PATH updates for ZSH
marten Feb 9, 2018
fa79228
update
marten Jun 4, 2018
2f2ec9e
Add work desktop to ssh
marten Jun 15, 2018
25b36fc
updates
marten Jun 15, 2018
bda6ffe
Clean up bin
marten Jun 18, 2018
7a0c31b
Cleanup
marten Jun 18, 2018
84a9512
migrate to rcm
marten Jun 18, 2018
e909923
foo
marten Jun 18, 2018
97b8b24
Merge branch 'master' of github.com:marten/dotfiles
marten Jun 18, 2018
19ee3fe
Fix vim
marten Jun 18, 2018
2584938
Fix zsh
marten Jun 18, 2018
9862216
Remove keychain from ssh (x-platform issues)
marten Jun 18, 2018
b551e94
Switch Vundle to Plug
marten Jun 18, 2018
996f4b3
remove nvim
marten Jun 18, 2018
f454fe3
prepare for linux
marten Jun 18, 2018
d814e82
Only link up subdirs of .config
marten Jun 18, 2018
0c136e1
Add emacs and doom
marten Jun 18, 2018
e6fbbdf
update submodules
marten Jun 19, 2018
57d5242
Prepare git for submodule usage
marten Jun 19, 2018
2ec5473
autoupdate?
marten Jun 19, 2018
41fcff0
Bump emacs.d from `f471ef3` to `0354edc`
dependabot-support Jun 21, 2018
fb6f9d4
Merge pull request #2 from marten/dependabot/submodules/emacs.d-0354edc
marten Jun 21, 2018
924c593
updates
marten Jun 25, 2018
23d9062
update youtubedown
Jun 25, 2018
b8b4402
Update doom emacs
marten Jun 25, 2018
e1600e9
Update doom config
marten Jun 25, 2018
a241cf6
Bump emacs.d from `c8de34f` to `af41e17`
dependabot-support Jun 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.DS_Store
*.pem
config/direnv
config/Fritzing
config/fish/fish_history
config/fish/fishd.*
config/xbuild
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[submodule "emacs.d"]
path = emacs.d
url = [email protected]:hlissner/doom-emacs.git
branch = develop
[submodule "doom.d"]
path = doom.d
url = [email protected]:marten/doom-emacs-private.git
update = merge
306 changes: 306 additions & 0 deletions .spacemacs

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
brew "libyaml"
brew "libxml2"
brew "libxslt"
brew "readline"
brew "openssl"
brew "openssl-osx-ca"
brew "vim"
brew "ssh-copy-id"
brew "the_silver_searcher"
brew "git"
brew "postgresql"
brew "mr"
brew "autojump"
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
dotfiles
========
========

These are my dotfiles. There are many like them, but these ones are mine.

## Installation

brew tap thoughtbot/formulae
brew install rcm
rcup -d ~/dotfiles



git clone git://github.com/marten/dotfiles ~/dotfiles
cd ~/dotfiles

## Inspired by

* https://github.com/holman/dotfiles
57 changes: 0 additions & 57 deletions Rakefile

This file was deleted.

6 changes: 6 additions & 0 deletions SHARPEN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
* Emacs smartparens dont work nicely.
* Emacs shortcut key for opening SHARPEN.md
* Emacs shortcut key for opening init.el
* Emacs shortcut key for reloading config
* Can emacs persist open buffers between launches?
* Dotfiles should auto-sync or have hotkey for sync
11 changes: 11 additions & 0 deletions ackrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--color
--pager=LESS=FSRX less -r
--type-add=ruby=.haml,.rake,.rsel
--type-set=haml=.haml
--type-set=sass=.sass
--type-set=erb=.erb
--type-set=yml=.yml
--type-set=coffeescript=.coffee
--type-set=markdown=.md,.markdown,.mdown
--nosql
--ignore-dir="i18n"
Loading