diff --git a/Changes b/Changes index 13cb36b..7264a5b 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,14 @@ +v2019-12-02 + * bash & zsh: + 增加了ssh-forget + * zsh: + 修改了MANPATH 错误问题 + 修改了路径插件不加载的问题 + * vim: + 不再启用插件vim-markdown + * terminator: + 修改了配置 + v2018-07-15 * ssh: 更新ssh 密钥 diff --git a/terminator/config b/terminator/config index b2e5754..fdd0191 100644 --- a/terminator/config +++ b/terminator/config @@ -55,7 +55,8 @@ [[default]] background_darkness = 0.85 background_type = transparent - font = Source Code Pro 13 + cursor_color = "#ffffff" + font = Source Code Pro 11 foreground_color = "#ffffff" palette = "#000000:#cc0000:#4e9a06:#c4a000:#3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#fce94f:#729fcf:#ad7fa8:#34e2e2:#eeeeec" scrollback_lines = 655360 diff --git a/vim/.vimrc b/vim/.vimrc index ed7514e..1bd29e8 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -44,7 +44,7 @@ Plugin 'morhetz/gruvbox' Plugin 'ntpeters/vim-better-whitespace' Plugin 'octol/vim-cpp-enhanced-highlight' Plugin 'pangloss/vim-javascript' -Plugin 'plasticboy/vim-markdown' " godlygeek/tabular +"Plugin 'plasticboy/vim-markdown' " godlygeek/tabular Plugin 'Rip-Rip/clang_complete' Plugin 'scrooloose/nerdcommenter' Plugin 'scrooloose/nerdtree' diff --git a/zsh/.zsh/reactor.sh b/zsh/.zsh/reactor.sh index 62407ca..c7f21eb 100644 --- a/zsh/.zsh/reactor.sh +++ b/zsh/.zsh/reactor.sh @@ -107,7 +107,7 @@ function myPluginLoader () # "alias" 和"path" 永远不应该被包含到这个数组 local SCRIPTDIR=( 'androidenv' 'apply' 'archpkg' 'custom' 'iam' 'ipmi' 'groot' 'less' - 'logintmux' 'mountcmds' 'profileutils' 'sshenv' 'vman' + 'logintmux' 'mountcmds' 'profileutils' 'ssh' 'sshenv' 'vman' ) for subdir in ${SCRIPTDIR[@]} diff --git a/zsh/.zsh/ssh/ssh.sh b/zsh/.zsh/ssh/ssh.sh new file mode 100644 index 0000000..66deda9 --- /dev/null +++ b/zsh/.zsh/ssh/ssh.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env cat +# ============================================================================== +# 删除~/.ssh/known_hosts 中的记录 +# ============================================================================== +# Create by Arondight +# ============================================================================== +# SOURCE ME!!! +# ============================================================================== +alias ssh-forget='ssh_forget' + +function ssh_forget () +{ + local line="$1" && shift + local known_hosts="${HOME}/.ssh/known_hosts" + + if [[ -w "$known_hosts" ]] + then + sed -i "${line}d" "$known_hosts" + fi + + return "$?" +} + diff --git a/zsh/.zshrc b/zsh/.zshrc index 3ce5264..f9c485a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -36,7 +36,7 @@ function oh_my_zsh_conf () plugins=( 'battery' 'colorize' 'command-not-found' 'common-aliases' 'copydir' 'copyfile' 'dircycle' 'dirhistory' 'dirpersist' 'encode64' 'gnu-utils' - 'history-substring-search' 'jump' 'pass per-directory-history' 'perl' + 'history-substring-search' 'jump' 'pass' 'per-directory-history' 'perl' 'systemadmin' 'textmate' 'themes' 'torrent' 'urltools' 'wd' 'web-search' 'zsh-navigation-tools' 'zsh_reload' ) @@ -70,7 +70,7 @@ function oh_my_zsh_conf () existcmd 'svn' && plugins+=('svn' 'svn-fast-info') existcmd 'systemctl' && plugins+='systemd' existcmd 'tmux' && plugins+='tmux' - existcmd 'whois' && plugins+='iwhois' + #existcmd 'whois' && plugins+='iwhois' existcmd 'yum' && plugins+='yum' existcmd 'zypper' && plugins+='suse' # 第三方插件 @@ -176,7 +176,10 @@ zmodload 'zsh/mathfunc' # 环境变量 # ============================================================================== # 额外的man 手册路径 -manpath+='/usr/local/man' +if [[ ${#manpath[@]} -gt 0 ]] +then + manpath+='/usr/local/man' +fi # 对manpath 进行一次去重 if existcmd 'awk' then