Merge branch 'master' of github.com:Mkaysi/shell-things

This commit is contained in:
Mikaela Suomalainen 2014-01-22 15:55:12 +02:00
commit 47337e5638
9 changed files with 33 additions and 13 deletions

View File

@ -16,6 +16,6 @@
status = true
ui = true
[user]
name = Mika Suomalainen
name = Mikaela Suomalainen
email = mkaysi@outlook.com
signingkey = 0x4DB53CFE82A46728
signingkey = 0xDAA6CA08F2E96AC7

View File

@ -3,6 +3,7 @@
cat .bash_aliases.MKAYSIGREP > ~/.bash_aliases
cat .zsh_aliases.MKAYSIGREP > ~/.zsh_aliases
cat .gitconfig.MKAYSIGREP > ~/.gitconfig
cat oidentd.conf > ~/.oidentd.conf
mkdir -p ~/.gnupg
cat sks-keyservers.netCA.pem > ~/.gnupg/sks-keyservers.netCA.pem
cat .gpg.conf.MKAYSIGREP > ~/.gnupg/gpg.conf

View File

@ -1,6 +1,6 @@
<pastebinit>
<pastebin>http://fpaste.org</pastebin>
<author>Mika Suomalainen</author>
<pastebin>http://sprunge.us</pastebin>
<author>Mkaysi</author>
<jabberid>mkaysi@jabber.org</jabberid>
<format>text</format>
</pastebinit>

15
bashrc
View File

@ -215,6 +215,10 @@ fi
export SSH_AUTH_SOCK=/tmp/$USER.agent
ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1
# In our series useless/weird environment variables, beep
beep=
BEEP=
##### Aliases RJ706I #####
# To get sudo work with aliases.
@ -236,9 +240,8 @@ alias gdrop="git stash && git stash drop"
# If I run nautilus, I want it to open in folder where I am.
#alias nautilus="nautilus ./"
# Why I must write "weechat-curses" to start it?
alias weechat="weechat-curses"
alias weechat-version="weechat-curses --help|head -n2"
#SHow compilation date of WeeChat.
alias weechat-version="weechat --help|head -n2"
#NMAP specific. All nmap things should be run as root, so it's probably best to copy these aliases to root's .bashrc. Things which don't run without root ask for sudo password.
alias nmap-intense="nmap -T4 -A -v -PE -PS22,25,80 -PA21,23,80,3389 "
@ -448,6 +451,12 @@ alias fcorepattern='echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf
# ffmpeg is depreceated
alias ffmpeg=avconv
# inxi https://code.google.com/p/inxi/
alias inxi-install="mkdir -p ~/.local/bin && cd ~/.local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd"
alias inxi-install-root="cd /usr/local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd"
alias inxi-update="inxi -U"
# Allow custom aliases to be put in .aliases or .bash_aliases .
# .aliases

View File

@ -16,6 +16,6 @@
status = true
ui = true
[user]
#name = Mika Suomalainen
#name = Mikaela Suomalainen
#email = mkaysi@outlook.com
#signingkey = 0x4DB53CFE82A46728
#signingkey = 0xDAA6CA08F2E96AC7

View File

@ -5,6 +5,7 @@ cat tmux.conf > ~/.tmux.conf
cat zshrc > ~/.zshrc
cat gitconfig > ~/.gitconfig
cat vimrc > ~/.vimrc
cat oidentd.conf > ~/.oidentd.conf
mkdir -p ~/.gnupg
cat gpg.conf > ~/.gnupg/gpg.conf
cat gpg-agent.conf > ~/.gnupg/gpg-agent.conf

1
oidentd.conf Normal file
View File

@ -0,0 +1 @@
global { numeric }

View File

@ -1,5 +1,5 @@
<pastebinit>
<pastebin>http://fpaste.org</pastebin>
<pastebin>http://sprunge.us</pastebin>
<author></author>
<jabberid></jabberid>
<format>text</format>

14
zshrc
View File

@ -158,6 +158,10 @@ if [[ $UNAME = "Darwin" && $USER = "root" ]]; then
fi
# The above requires at least Mountain Lion.
# In our series useless/weird environment variables, beep
beep=
BEEP=
##### Aliases RJ706I #####
# To get sudo work with aliases.
@ -176,9 +180,8 @@ alias youtube-dl="youtube-dl -t"
alias gdrop="git stash && git stash drop"
#alias gitk="gitg" # Requires gitg . I just think that it looks nicer than gitk. # MKAYSIGREP MKAYSIGREPALIAS
# Why I must write "weechat-curses" to start it?
alias weechat="weechat-curses"
alias weechat-version="weechat-curses --help|head -n2"
# Show compilation date of WeeChat.
alias weechat-version="weechat --help|head -n2"
#NMAP specific. All nmap things should be run as root, so it's probably best to copy these aliases to root's .zshrc. Things which don't run without root ask for sudo password.
alias nmap-intense="nmap -T4 -A -v -PE -PS22,25,80 -PA21,23,80,3389 "
@ -421,6 +424,11 @@ alias fcorepattern='echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf
# ffmpeg is depreceated
alias ffmpeg=avconv
# inxi https://code.google.com/p/inxi/
alias inxi-install="mkdir -p ~/.local/bin && cd ~/.local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd"
alias inxi-install-root="cd /usr/local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd"
alias inxi-update="inxi -U"
# .aliases
if [ -f ~/.aliases ]; then