jon
|
02be8e62b4
|
Testing conflict
|
2018-06-24 15:29:23 -05:00 |
|
jon
|
4f3771f4ce
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
Conflicts:
bash/.bashrc
vim/.vim/bundle/calendar.vim
vim/.vim/bundle/jedi-vim
vim/.vim/bundle/lightline.vim
vim/.vim/bundle/nerdtree
vim/.vim/bundle/syntastic
vim/.vim/bundle/vim-fugitive
|
2018-06-24 15:15:36 -05:00 |
|
jon
|
cb8d5ead68
|
ugh
|
2018-06-24 15:15:18 -05:00 |
|
Jon Dossey
|
8f3230921e
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
Conflicts:
vim/.vim/bundle/lightline.vim
|
2018-06-21 17:17:51 -05:00 |
|
Jon Dossey
|
e6fbc77181
|
Updated some stuff (great msg right?)
|
2018-06-21 17:16:04 -05:00 |
|
Jon Dossey
|
164ab9f4d8
|
Created tools dir for simple scripts
|
2018-06-21 12:30:32 -05:00 |
|
jomido
|
b76e125cd4
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
|
2018-06-20 11:52:01 -05:00 |
|
jomido
|
7389708dcd
|
Updated bashrc, dmesg -T and l/ll/etc colors
|
2018-06-20 11:50:59 -05:00 |
|
jond
|
36ce64ada6
|
Vim plugin updates
|
2018-06-02 07:33:56 -05:00 |
|
jond
|
19f53fba26
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
|
2018-06-02 07:33:41 -05:00 |
|
jond
|
20434b8de1
|
Updated default pager settings
|
2018-06-02 07:33:17 -05:00 |
|
jomido
|
26bf46ad54
|
Fixed merge issues
|
2018-05-23 10:21:47 -05:00 |
|
jomido
|
eb6a811be7
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
|
2018-05-23 09:35:52 -05:00 |
|
jomido
|
7526102530
|
Added vi mode back into bashrc and fixed cls bug
|
2018-05-23 09:34:49 -05:00 |
|
jomido
|
daa517a02f
|
Main thing here was adding enter mapping in vim to
insert newline without leaving normal mode
|
2018-05-23 09:34:49 -05:00 |
|
jon
|
8339691402
|
Removed xrdb from bashrc
|
2018-05-20 10:08:10 -05:00 |
|
jond
|
3c959a0fb8
|
Big change here was tmux status bar and messing with X colors
|
2018-05-20 08:57:21 -05:00 |
|
jond
|
bd4ca982b1
|
Added easyescape for faster jk/kj escaping
|
2018-05-05 08:02:30 -05:00 |
|
jond
|
f8110f9e99
|
Made a bunch of changes to shit whoops
|
2018-04-28 09:57:25 -05:00 |
|
jond
|
6898dd3545
|
Added kj as additional mapping so i can just mash it
|
2017-12-23 10:54:26 -06:00 |
|
jond
|
06a46e5ff7
|
Added some comments and jk to leave insert because I keep trying to use
it
|
2017-12-23 10:32:26 -06:00 |
|
jond
|
118990f58e
|
Switched from airline to lightline and modified vimrc to hide showmode
|
2017-12-23 10:14:40 -06:00 |
|
jond
|
dbb9b96980
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2017-12-16 13:05:21 -06:00 |
|
jond
|
66eb427a0d
|
vim relative line numbers and some other stuff
|
2017-12-16 13:04:54 -06:00 |
|
jond
|
5080ea55a5
|
Deleted the crap from the mergetool
|
2017-12-13 15:23:08 -06:00 |
|
jond
|
2bca7516f9
|
Cleaned up cruft from merge
|
2017-12-13 15:21:42 -06:00 |
|
jond
|
50be979e63
|
Merge branch 'master' of ssh://jonfu.com/home/jon/dots
|
2017-12-13 15:20:38 -06:00 |
|
jond
|
73be33c555
|
Updated tmux mouse option
|
2017-12-13 15:16:42 -06:00 |
|
jond
|
8ec84cb04c
|
Removed nested for now
|
2017-11-02 19:05:10 -05:00 |
|
jond
|
4b6766a215
|
Added nested tmux config
|
2017-11-02 19:02:21 -05:00 |
|
jond
|
9d59533e47
|
Mapped C-Tab to function like alt-tab
|
2017-09-24 17:54:32 -05:00 |
|
jond
|
0b5286026c
|
Merge branch 'master' of ssh://fatmike/home/jon/dots
|
2017-09-24 17:13:35 -05:00 |
|
jon
|
a713ceaf04
|
Cleaned up tmux
|
2017-09-09 14:04:18 -05:00 |
|
jon
|
7ef6e0dfc7
|
Conditional to set mouse correctly depending on tmux version
|
2017-09-09 13:51:28 -05:00 |
|
jond
|
e141d0b1f8
|
Removed a comment from Xresources
|
2017-09-09 09:00:13 -05:00 |
|
jon
|
b8a66cc256
|
Merge branch 'master' of ssh://fatmike/home/jon/dots
|
2017-09-09 08:49:47 -05:00 |
|
jon
|
b23304d3a9
|
Updated bashrc
|
2017-09-09 08:49:37 -05:00 |
|
jon
|
425bf76513
|
Several changes including removing the vi readline setting because it
was improperly interpreting ^L to clear screen. Added clickable URLs to
rxvt config. Updated some plugins for VIM.
|
2017-09-05 22:20:06 -05:00 |
|
jon
|
59fea36edd
|
Updated vimrc to use background color instead of underline for cursorline
|
2017-08-06 11:22:48 -05:00 |
|
jon
|
1970136620
|
Added config for ncmpcpp
|
2017-08-05 09:35:22 -05:00 |
|
jon
|
fa6df45de7
|
Updates from vim plugins on new boxes
|
2017-07-30 16:54:48 -05:00 |
|
jon
|
a2992665a2
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2017-07-30 16:54:28 -05:00 |
|
jon
|
11329aa465
|
Added comment to .tmux.conf
|
2017-07-30 16:54:09 -05:00 |
|
jon
|
263d721540
|
Cleanup comments, messing with copy/past
|
2017-07-30 16:54:09 -05:00 |
|
jomido
|
fc8ca199a9
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2017-07-27 23:41:23 -05:00 |
|
jomido
|
20ca5e79ff
|
Added some stuff
|
2017-07-27 23:39:53 -05:00 |
|
jomido
|
18a4668e83
|
Added xinitrc
|
2017-07-27 23:39:05 -05:00 |
|
jon
|
c709b8746f
|
Fixed a typo in tmux.conf
|
2017-07-23 11:44:46 -05:00 |
|
jon
|
b03f5b1bb9
|
Updated .Xresources to change default font size from 12 to 14, which seems to work better on both 24" and 14"
Updated tmux to clean up formatting and also change keybindings for moving between splits and to set the index to 1 so default window isnt [prefix]-0
|
2017-07-23 11:39:28 -05:00 |
|
jon
|
f62d14fa8c
|
Added all dotfiles
|
2017-07-09 19:22:08 -05:00 |
|