From a5c1a639c661455ede437e9b466262e039a53a05 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 2 Nov 2022 14:19:55 +0300 Subject: [PATCH] Split zsh configuration on corresponding sections --- {zsh => git}/.zsh/functions/Gam | 0 {zsh => git}/.zsh/functions/Gbr | 0 {zsh => git}/.zsh/functions/Gg | 0 {zsh => git}/.zsh/functions/Gm | 0 {zsh => git}/.zsh/functions/Gr | 0 {zsh => git}/.zsh/rc/010git.zsh | 4 +++- {zsh => git}/.zsh/rc/010vcs.zsh | 0 gnupg/.zsh/rc/010gpg.zsh | 2 ++ {zsh => less}/.lesskey | 0 {zsh => less}/.zsh/env/005less.zsh | 0 less/.zsh/rc/010less.zsh | 2 ++ {zsh => lynx}/.zsh/env/005lynx.zsh | 0 {zsh => mc}/.zsh/rc/025mc.zsh | 0 {zsh => mutt}/.zsh/rc/010mail.zsh | 0 {zsh => recoll}/.zsh/env/005recoll.zsh | 0 {zsh => ssh}/.zsh/functions/ssht | 0 {zsh => ssh}/.zsh/rc/010ssh.zsh | 0 zsh/.zsh/rc/010aliases.zsh | 16 +++++++--------- zsh/.zsh/rc/010gpg.zsh | 1 - zsh/.zsh/rc/010grep.zsh | 3 --- 20 files changed, 14 insertions(+), 14 deletions(-) rename {zsh => git}/.zsh/functions/Gam (100%) rename {zsh => git}/.zsh/functions/Gbr (100%) rename {zsh => git}/.zsh/functions/Gg (100%) rename {zsh => git}/.zsh/functions/Gm (100%) rename {zsh => git}/.zsh/functions/Gr (100%) rename {zsh => git}/.zsh/rc/010git.zsh (80%) rename {zsh => git}/.zsh/rc/010vcs.zsh (100%) create mode 100644 gnupg/.zsh/rc/010gpg.zsh rename {zsh => less}/.lesskey (100%) rename {zsh => less}/.zsh/env/005less.zsh (100%) create mode 100644 less/.zsh/rc/010less.zsh rename {zsh => lynx}/.zsh/env/005lynx.zsh (100%) rename {zsh => mc}/.zsh/rc/025mc.zsh (100%) rename {zsh => mutt}/.zsh/rc/010mail.zsh (100%) rename {zsh => recoll}/.zsh/env/005recoll.zsh (100%) rename {zsh => ssh}/.zsh/functions/ssht (100%) rename {zsh => ssh}/.zsh/rc/010ssh.zsh (100%) delete mode 100644 zsh/.zsh/rc/010gpg.zsh delete mode 100644 zsh/.zsh/rc/010grep.zsh diff --git a/zsh/.zsh/functions/Gam b/git/.zsh/functions/Gam similarity index 100% rename from zsh/.zsh/functions/Gam rename to git/.zsh/functions/Gam diff --git a/zsh/.zsh/functions/Gbr b/git/.zsh/functions/Gbr similarity index 100% rename from zsh/.zsh/functions/Gbr rename to git/.zsh/functions/Gbr diff --git a/zsh/.zsh/functions/Gg b/git/.zsh/functions/Gg similarity index 100% rename from zsh/.zsh/functions/Gg rename to git/.zsh/functions/Gg diff --git a/zsh/.zsh/functions/Gm b/git/.zsh/functions/Gm similarity index 100% rename from zsh/.zsh/functions/Gm rename to git/.zsh/functions/Gm diff --git a/zsh/.zsh/functions/Gr b/git/.zsh/functions/Gr similarity index 100% rename from zsh/.zsh/functions/Gr rename to git/.zsh/functions/Gr diff --git a/zsh/.zsh/rc/010git.zsh b/git/.zsh/rc/010git.zsh similarity index 80% rename from zsh/.zsh/rc/010git.zsh rename to git/.zsh/rc/010git.zsh index eed04e4..935a17b 100644 --- a/zsh/.zsh/rc/010git.zsh +++ b/git/.zsh/rc/010git.zsh @@ -3,8 +3,10 @@ alias Gb="git branch" alias Gc="git checkout" alias Gd="git diff" alias Gdc="git diff --cached" -alias Gs="git show --show-signature" +alias gg="git grep " +alias ggj="GIT_EDITOR=\"$EDITOR -c copen\" git jump grep " alias Gl="git log --oneline --graph --decorate=short" alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'" alias Gp="git log --patch" +alias Gs="git show --show-signature" bindkey -s "OR" " git status --short\n" # F3 diff --git a/zsh/.zsh/rc/010vcs.zsh b/git/.zsh/rc/010vcs.zsh similarity index 100% rename from zsh/.zsh/rc/010vcs.zsh rename to git/.zsh/rc/010vcs.zsh diff --git a/gnupg/.zsh/rc/010gpg.zsh b/gnupg/.zsh/rc/010gpg.zsh new file mode 100644 index 0000000..8414481 --- /dev/null +++ b/gnupg/.zsh/rc/010gpg.zsh @@ -0,0 +1,2 @@ +export GPG_TTY=$(tty) +alias gpgkr="gpg --no-default-keyring --keyring " diff --git a/zsh/.lesskey b/less/.lesskey similarity index 100% rename from zsh/.lesskey rename to less/.lesskey diff --git a/zsh/.zsh/env/005less.zsh b/less/.zsh/env/005less.zsh similarity index 100% rename from zsh/.zsh/env/005less.zsh rename to less/.zsh/env/005less.zsh diff --git a/less/.zsh/rc/010less.zsh b/less/.zsh/rc/010less.zsh new file mode 100644 index 0000000..cc0e1f4 --- /dev/null +++ b/less/.zsh/rc/010less.zsh @@ -0,0 +1,2 @@ +alias -g M="| less" +alias m="less " diff --git a/zsh/.zsh/env/005lynx.zsh b/lynx/.zsh/env/005lynx.zsh similarity index 100% rename from zsh/.zsh/env/005lynx.zsh rename to lynx/.zsh/env/005lynx.zsh diff --git a/zsh/.zsh/rc/025mc.zsh b/mc/.zsh/rc/025mc.zsh similarity index 100% rename from zsh/.zsh/rc/025mc.zsh rename to mc/.zsh/rc/025mc.zsh diff --git a/zsh/.zsh/rc/010mail.zsh b/mutt/.zsh/rc/010mail.zsh similarity index 100% rename from zsh/.zsh/rc/010mail.zsh rename to mutt/.zsh/rc/010mail.zsh diff --git a/zsh/.zsh/env/005recoll.zsh b/recoll/.zsh/env/005recoll.zsh similarity index 100% rename from zsh/.zsh/env/005recoll.zsh rename to recoll/.zsh/env/005recoll.zsh diff --git a/zsh/.zsh/functions/ssht b/ssh/.zsh/functions/ssht similarity index 100% rename from zsh/.zsh/functions/ssht rename to ssh/.zsh/functions/ssht diff --git a/zsh/.zsh/rc/010ssh.zsh b/ssh/.zsh/rc/010ssh.zsh similarity index 100% rename from zsh/.zsh/rc/010ssh.zsh rename to ssh/.zsh/rc/010ssh.zsh diff --git a/zsh/.zsh/rc/010aliases.zsh b/zsh/.zsh/rc/010aliases.zsh index 0180fcf..654efd9 100644 --- a/zsh/.zsh/rc/010aliases.zsh +++ b/zsh/.zsh/rc/010aliases.zsh @@ -1,13 +1,11 @@ -alias l="ls -AF, " -alias ll="ls -D \"%Y-%m-%d %H:%M\" -AFl, " -alias vi="vim" -alias m="less " -alias -g M="| less" -alias -g W="| wc -l | sed 's/ //g'" -alias -g T="| tai64nlocal" -alias -g DN=">/dev/null" alias -g 2DN="2>/dev/null" +alias -g DN=">/dev/null" alias -g DNA=">&/dev/null" +alias -g G="| grep --colour=always" +alias -g T="| tai64nlocal" alias -g TO="2>&1" +alias -g W="| wc -l | sed 's/ //g'" +alias l="ls -AF, " +alias ll="ls -D \"%Y-%m-%d %H:%M\" -AFl, " alias mc="mc --nomouse" -alias gpgkr="gpg --no-default-keyring --keyring " +alias vi="vim" diff --git a/zsh/.zsh/rc/010gpg.zsh b/zsh/.zsh/rc/010gpg.zsh deleted file mode 100644 index 9b7b42d..0000000 --- a/zsh/.zsh/rc/010gpg.zsh +++ /dev/null @@ -1 +0,0 @@ -export GPG_TTY=$(tty) diff --git a/zsh/.zsh/rc/010grep.zsh b/zsh/.zsh/rc/010grep.zsh deleted file mode 100644 index d14c1ff..0000000 --- a/zsh/.zsh/rc/010grep.zsh +++ /dev/null @@ -1,3 +0,0 @@ -alias -g G="| grep --colour=always" -alias gg="git grep " -alias ggj="GIT_EDITOR=\"$EDITOR -c copen\" git jump grep " -- 2.44.0