Commit Graph

76 Commits

Author SHA1 Message Date
jond
b85b1f74e4 Added time-style format to bashrc 2018-09-08 14:36:02 -05:00
jomido
7fbec71d0a Changed date format on ls aliases (l and ll) 2018-08-24 14:14:48 -05:00
jond
bd9efcb12e Added keybind for @ (next to !) to join-pane 2018-07-29 22:08:02 -05:00
jond
0afc76a569 Force colors on ls 2018-07-29 14:55:30 -05:00
jond
bb8674f96e Removed output from inner/our tmux 2018-07-29 13:33:07 -05:00
jond
26a57d26b0 Fixed rxvt bgcolor to match dwm 2018-07-29 13:19:50 -05:00
jond
07cddb4a8f awesome: Hid the layoutbox icon in the top right corner 2018-07-28 12:39:19 -05:00
jond
4ca97e7d70 Added padding to xrvt and awesome config 2018-07-28 12:33:46 -05:00
jond
37f476bf90 Removed some files 2018-07-28 12:28:05 -05:00
jond
5bf3a08cf3 Merge remote-tracking branch 'refs/remotes/origin/master' 2018-07-28 11:37:42 -05:00
jond
9627470c6d Updated 2018-07-28 11:35:15 -05:00
jomido
117278ea13 Added vertical column at 79 characters to see wrap edge 2018-07-23 11:04:39 -05:00
jomido
153d796c45 Merge branch 'master' of ssh://jonfu.com/home/jon/dots 2018-07-23 11:02:58 -05:00
jomido
d71ae981d4 Fixed tmux mouse and xresources merge conflict 2018-07-22 14:28:20 -05:00
jomido
e9a1e917d4 Removing those annoying indexes 2018-07-22 14:24:33 -05:00
jomido
3e31362714 Merge branch 'master' of ssh://jonfu.com/home/jon/dots 2018-07-22 14:04:57 -05:00
jomido
712e769bf1 Chromebook commits, tmux, x etc 2018-07-22 14:00:05 -05:00
jond
4009da9484 Fixed pager (less) options to deal with ansi esc sequences 2018-07-21 11:08:25 -05:00
jomido
033ae55594 This was a rebase from master 2018-07-18 15:45:19 -05:00
jomido
af5fcee77d Added some options to $LESS and messed with vim clipboard 2018-07-18 15:45:11 -05:00
jond
68b5930061 Merge remote-tracking branch 'refs/remotes/origin/master' 2018-07-08 10:58:13 -05:00
jond
b30b90d1e0 Added F12 for inner/outer during nested tmux 2018-07-08 10:57:51 -05:00
jon
70573e3500 Merge branch 'master' of ssh://jonfu.com/home/jon/dots
Conflicts:
	bash/.bashrc
2018-06-24 15:31:12 -05:00
jon
02be8e62b4 Testing conflict 2018-06-24 15:29:23 -05:00
jond
92b38dfb53 Merge branch 'master' of ssh://jonfu.com/home/jon/dots 2018-06-24 15:28:45 -05:00
jond
f9777101cf Testing conflict resolution 2018-06-24 15:27:25 -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