jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Testing conflict

Browse Source
This commit is contained in:
jon
2018-06-24 15:29:23 -05:00
parent 4f3771f4ce
commit 02be8e62b4
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bash/.bashrc
View File

@@ -22,11 +22,9 @@ alias l='ls -lh --color=auto'
alias ll='ls -lh --color=auto' alias ll='ls -lh --color=auto'
alias p='ping' alias p='ping'
alias s='sudo' alias s='sudo'
<<<<<<< HEAD
alias dmesg='dmesg -H' alias dmesg='dmesg -H'
=======
alias ip='ip -c' alias ip='ip -c'
>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3 alias poop='/usr/bin/sleep'
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath
@@ -35,13 +33,10 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
export EDITOR=/usr/bin/vim export EDITOR=/usr/bin/vim
[ -f ~/.fzf.bash ] && source ~/.fzf.bash [ -f ~/.fzf.bash ] && source ~/.fzf.bash
<<<<<<< HEAD
alias p='ping' alias p='ping'
=======
#ctrl-x, ctrl-e to launch $EDITOR (vim) #ctrl-x, ctrl-e to launch $EDITOR (vim)
bind -m vi-insert '"\C-x\C-e": edit-and-execute-command' bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
#fix clear screen in vi mode #fix clear screen in vi mode
bind -m vi-insert "\C-l":clear-screen bind -m vi-insert "\C-l":clear-screen
>>>>>>> 8f3230921e0db7fc1f6198ef62604af9b1e6b833