From 3b738f8a8381dc40c7965f95ac43175a90d652c1 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 29 Dec 2013 11:16:10 +0200 Subject: [PATCH 01/12] gitconfig: fix name & GPG key --- .gitconfig.MKAYSIGREP | 4 ++-- gitconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP index 1dc94063..a7ede7f4 100644 --- a/.gitconfig.MKAYSIGREP +++ b/.gitconfig.MKAYSIGREP @@ -16,6 +16,6 @@ status = true ui = true [user] - name = Mika Suomalainen + name = Mikaela Suomalainen email = mkaysi@outlook.com - signingkey = 0x4DB53CFE82A46728 + signingkey = 0xDAA6CA08F2E96AC7 diff --git a/gitconfig b/gitconfig index e3a1b57e..71047feb 100644 --- a/gitconfig +++ b/gitconfig @@ -16,6 +16,6 @@ status = true ui = true [user] - #name = Mika Suomalainen + #name = Mikaela Suomalainen #email = mkaysi@outlook.com - #signingkey = 0x4DB53CFE82A46728 + #signingkey = 0xDAA6CA08F2E96AC7 From bc841f2491115ebb55b41f77e393c4c77bc25c2a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sat, 4 Jan 2014 13:37:33 +0200 Subject: [PATCH 02/12] pastebinit: change to sprunge.us It seems to be FOSS and not connected to specific Operating System. --- .pastebinit.xml.MKAYSIGREP | 4 ++-- pastebinit.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pastebinit.xml.MKAYSIGREP b/.pastebinit.xml.MKAYSIGREP index 2423dec1..25e114d3 100644 --- a/.pastebinit.xml.MKAYSIGREP +++ b/.pastebinit.xml.MKAYSIGREP @@ -1,6 +1,6 @@ - http://fpaste.org - Mika Suomalainen + http://sprunge.us + Mkaysi mkaysi@jabber.org text diff --git a/pastebinit.xml b/pastebinit.xml index 433db0b4..35d97b0f 100644 --- a/pastebinit.xml +++ b/pastebinit.xml @@ -1,5 +1,5 @@ - http://fpaste.org + http://sprunge.us text From cb91c632e320567e5475a79b339443af4e165a06 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sat, 4 Jan 2014 19:36:31 +0200 Subject: [PATCH 03/12] Add oidentd.conf replying with uid. and add it to install scripts. It can't be used for logging in unlike username and it's dynamic and shouldn't be too long for servers. --- .install.MKAYSIGREP.run | 1 + install.run | 1 + oidentd.conf | 1 + 3 files changed, 3 insertions(+) create mode 100644 oidentd.conf diff --git a/.install.MKAYSIGREP.run b/.install.MKAYSIGREP.run index df6b2de9..dff7ede6 100755 --- a/.install.MKAYSIGREP.run +++ b/.install.MKAYSIGREP.run @@ -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 diff --git a/install.run b/install.run index 8e83b378..640a98ae 100755 --- a/install.run +++ b/install.run @@ -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 diff --git a/oidentd.conf b/oidentd.conf new file mode 100644 index 00000000..7a3e5917 --- /dev/null +++ b/oidentd.conf @@ -0,0 +1 @@ +global { numeric } \ No newline at end of file From ff55d99ca7305f325a874b69f61d2bcdea76d216 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sat, 4 Jan 2014 19:42:35 +0200 Subject: [PATCH 04/12] pastebinit.xml: use @ProgVal's pastebin. Thanks Unit193 :) --- .pastebinit.xml.MKAYSIGREP | 2 +- pastebinit.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pastebinit.xml.MKAYSIGREP b/.pastebinit.xml.MKAYSIGREP index 25e114d3..bd25c8ee 100644 --- a/.pastebinit.xml.MKAYSIGREP +++ b/.pastebinit.xml.MKAYSIGREP @@ -1,5 +1,5 @@ - http://sprunge.us + http://paste.progval.net Mkaysi mkaysi@jabber.org text diff --git a/pastebinit.xml b/pastebinit.xml index 35d97b0f..2fe518fd 100644 --- a/pastebinit.xml +++ b/pastebinit.xml @@ -1,5 +1,5 @@ - http://sprunge.us + http://paste.progval.net text From 8ec4aa6545d626a599f4705dce39073cbf69bcd2 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sat, 4 Jan 2014 19:49:50 +0200 Subject: [PATCH 05/12] Revert "pastebinit.xml: use @ProgVal's pastebin." This reverts commit ff55d99ca7305f325a874b69f61d2bcdea76d216. --- .pastebinit.xml.MKAYSIGREP | 2 +- pastebinit.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pastebinit.xml.MKAYSIGREP b/.pastebinit.xml.MKAYSIGREP index bd25c8ee..25e114d3 100644 --- a/.pastebinit.xml.MKAYSIGREP +++ b/.pastebinit.xml.MKAYSIGREP @@ -1,5 +1,5 @@ - http://paste.progval.net + http://sprunge.us Mkaysi mkaysi@jabber.org text diff --git a/pastebinit.xml b/pastebinit.xml index 2fe518fd..35d97b0f 100644 --- a/pastebinit.xml +++ b/pastebinit.xml @@ -1,5 +1,5 @@ - http://paste.progval.net + http://sprunge.us text From cb13e192a2fe67963c114334d6a35c673e635c90 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 8 Jan 2014 21:18:57 +0200 Subject: [PATCH 06/12] bashrc & zshrc: add inxi-install & inxi-update Thanks to their easy installation instructions at https://code.google.com/p/inxi/wiki/Installation :) --- bashrc | 4 ++++ zshrc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bashrc b/bashrc index 96a067b9..3c90ed91 100644 --- a/bashrc +++ b/bashrc @@ -448,6 +448,10 @@ 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="cd ~/.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 diff --git a/zshrc b/zshrc index f1f6ed8c..c067df51 100644 --- a/zshrc +++ b/zshrc @@ -421,6 +421,10 @@ 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="cd ~/.local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd" +alias inxi-update="inxi -U" + # .aliases if [ -f ~/.aliases ]; then From 14a16087070e40da04b0120acd306088b3820d4c Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 14 Jan 2014 19:08:53 +0200 Subject: [PATCH 07/12] bashrc & zshrc: fix alias inxi-install & add alias inxi-install-root 1. Previously the Alias failed if the directory ~/.local/bin didn't exist. 2. Add Alias inxi-install-root for global installation as root. --- bashrc | 4 +++- zshrc | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index 3c90ed91..e606c812 100644 --- a/bashrc +++ b/bashrc @@ -449,9 +449,11 @@ alias fcorepattern='echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf alias ffmpeg=avconv # inxi https://code.google.com/p/inxi/ -alias inxi-install="cd ~/.local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd" +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 diff --git a/zshrc b/zshrc index c067df51..f02efec7 100644 --- a/zshrc +++ b/zshrc @@ -422,7 +422,8 @@ alias fcorepattern='echo kernel.core_pattern = %e-%p-%h.core >> /etc/sysctl.conf alias ffmpeg=avconv # inxi https://code.google.com/p/inxi/ -alias inxi-install="cd ~/.local/bin && \wget -Nc smxi.org/inxi && chmod +x inxi && cd" +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" From 4f2ebc409da0b4fd69c4bd0be9314cf4987ac3b1 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 14 Jan 2014 21:34:37 +0200 Subject: [PATCH 08/12] bashrc & zshrc: remove alias weechat=weechat-curses Starting with version 0.4.2 the binary is called as weechat and weechat-curses is symbolic link to it for compatibility. --- bashrc | 5 ++--- zshrc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bashrc b/bashrc index e606c812..381b7d38 100644 --- a/bashrc +++ b/bashrc @@ -236,9 +236,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 " diff --git a/zshrc b/zshrc index f02efec7..24854bdf 100644 --- a/zshrc +++ b/zshrc @@ -176,9 +176,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 " From 0a98c62d6650e3dc3e3e5683ee3b43fdc3fb779c Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 15 Jan 2014 14:28:44 +0200 Subject: [PATCH 09/12] bashrc & zshrc: playing around with environment. $beep and $BEEP  --- bashrc | 4 ++++ zshrc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bashrc b/bashrc index 381b7d38..7455d27b 100644 --- a/bashrc +++ b/bashrc @@ -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. diff --git a/zshrc b/zshrc index 24854bdf..111dd790 100644 --- a/zshrc +++ b/zshrc @@ -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. From 79fcf0477e2a441592f1f443a016a886a9debbf7 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 17 Jan 2014 13:24:26 +0200 Subject: [PATCH 10/12] Update zshrc --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 111dd790..faa53524 100644 --- a/zshrc +++ b/zshrc @@ -27,7 +27,7 @@ zstyle ':vcs_info:*' formats '%b ' precmd() { vcs_info } PS1="%B%(!.%F{red}.%F{green})%n@%m %~ -%# %(?..%B%?%b )%f%b" +%(?..%B%?%b )%f%b" %# setopt histignorealldups sharehistory From 1a120b17ab75eaf190c21c3e3445a942bd801c76 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 17 Jan 2014 13:25:16 +0200 Subject: [PATCH 11/12] Update zshrc --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index faa53524..ca2cee19 100644 --- a/zshrc +++ b/zshrc @@ -27,7 +27,7 @@ zstyle ':vcs_info:*' formats '%b ' precmd() { vcs_info } PS1="%B%(!.%F{red}.%F{green})%n@%m %~ -%(?..%B%?%b )%f%b" %# +%(?..%B%?%b )%f%b %#" setopt histignorealldups sharehistory From 4beef9d01228cabbcc52c37134ed21d402b0b042 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 17 Jan 2014 13:27:46 +0200 Subject: [PATCH 12/12] Update zshrc --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index ca2cee19..111dd790 100644 --- a/zshrc +++ b/zshrc @@ -27,7 +27,7 @@ zstyle ':vcs_info:*' formats '%b ' precmd() { vcs_info } PS1="%B%(!.%F{red}.%F{green})%n@%m %~ -%(?..%B%?%b )%f%b %#" +%# %(?..%B%?%b )%f%b" setopt histignorealldups sharehistory