updated stuff
This commit is contained in:
parent
c4ff5a9900
commit
3daf1fff77
3 changed files with 6 additions and 167 deletions
|
@ -5,8 +5,12 @@ fi
|
||||||
source $ZDOTDIR/exports.zsh
|
source $ZDOTDIR/exports.zsh
|
||||||
source $ZDOTDIR/dircolor.zsh
|
source $ZDOTDIR/dircolor.zsh
|
||||||
|
|
||||||
source $share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
if [[ $(hostname) == "megumi" || $(hostname) == "sayaka" ]]; then
|
||||||
source $share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
source $share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
source $share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
|
||||||
|
else
|
||||||
|
source $share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
fi
|
||||||
|
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
if [[ -n $HOME/.cache/zsh/compdump(#qN.mh+24) ]]; then compinit -d $HOME/.cache/zsh/compdump; else compinit -d $HOME/.cache/zsh/compdump -C; fi
|
if [[ -n $HOME/.cache/zsh/compdump(#qN.mh+24) ]]; then compinit -d $HOME/.cache/zsh/compdump; else compinit -d $HOME/.cache/zsh/compdump -C; fi
|
||||||
|
|
|
@ -1,86 +0,0 @@
|
||||||
# System clipboard integration
|
|
||||||
#
|
|
||||||
# This file has support for doing system clipboard copy and paste operations
|
|
||||||
# from the command line in a generic cross-platform fashion.
|
|
||||||
#
|
|
||||||
# On OS X and Windows, the main system clipboard or "pasteboard" is used. On other
|
|
||||||
# Unix-like OSes, this considers the X Windows CLIPBOARD selection to be the
|
|
||||||
# "system clipboard", and the X Windows `xclip` command must be installed.
|
|
||||||
|
|
||||||
# clipcopy - Copy data to clipboard
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
#
|
|
||||||
# <command> | clipcopy - copies stdin to clipboard
|
|
||||||
#
|
|
||||||
# clipcopy <file> - copies a file's contents to clipboard
|
|
||||||
#
|
|
||||||
function clipcopy() {
|
|
||||||
emulate -L zsh
|
|
||||||
local file=$1
|
|
||||||
if [[ $OSTYPE == darwin* ]]; then
|
|
||||||
if [[ -z $file ]]; then
|
|
||||||
pbcopy
|
|
||||||
else
|
|
||||||
cat $file | pbcopy
|
|
||||||
fi
|
|
||||||
elif [[ $OSTYPE == cygwin* ]]; then
|
|
||||||
if [[ -z $file ]]; then
|
|
||||||
cat > /dev/clipboard
|
|
||||||
else
|
|
||||||
cat $file > /dev/clipboard
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if (( $+commands[xclip] )); then
|
|
||||||
if [[ -z $file ]]; then
|
|
||||||
xclip -in -selection clipboard
|
|
||||||
else
|
|
||||||
xclip -in -selection clipboard $file
|
|
||||||
fi
|
|
||||||
elif (( $+commands[xsel] )); then
|
|
||||||
if [[ -z $file ]]; then
|
|
||||||
xsel --clipboard --input
|
|
||||||
else
|
|
||||||
cat "$file" | xsel --clipboard --input
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# clippaste - "Paste" data from clipboard to stdout
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
#
|
|
||||||
# clippaste - writes clipboard's contents to stdout
|
|
||||||
#
|
|
||||||
# clippaste | <command> - pastes contents and pipes it to another process
|
|
||||||
#
|
|
||||||
# clippaste > <file> - paste contents to a file
|
|
||||||
#
|
|
||||||
# Examples:
|
|
||||||
#
|
|
||||||
# # Pipe to another process
|
|
||||||
# clippaste | grep foo
|
|
||||||
#
|
|
||||||
# # Paste to a file
|
|
||||||
# clippaste > file.txt
|
|
||||||
function clippaste() {
|
|
||||||
emulate -L zsh
|
|
||||||
if [[ $OSTYPE == darwin* ]]; then
|
|
||||||
pbpaste
|
|
||||||
elif [[ $OSTYPE == cygwin* ]]; then
|
|
||||||
cat /dev/clipboard
|
|
||||||
else
|
|
||||||
if (( $+commands[xclip] )); then
|
|
||||||
xclip -out -selection clipboard
|
|
||||||
elif (( $+commands[xsel] )); then
|
|
||||||
xsel --clipboard --output
|
|
||||||
else
|
|
||||||
print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
|
@ -1,15 +1,3 @@
|
||||||
function zsh_stats() {
|
|
||||||
fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl | head -n20
|
|
||||||
}
|
|
||||||
|
|
||||||
function uninstall_oh_my_zsh() {
|
|
||||||
env ZSH=$ZSH sh $ZSH/tools/uninstall.sh
|
|
||||||
}
|
|
||||||
|
|
||||||
function upgrade_oh_my_zsh() {
|
|
||||||
env ZSH=$ZSH sh $ZSH/tools/upgrade.sh
|
|
||||||
}
|
|
||||||
|
|
||||||
function take() {
|
function take() {
|
||||||
mkdir -p $@ && cd ${@:$#}
|
mkdir -p $@ && cd ${@:$#}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +5,6 @@ function take() {
|
||||||
function open_command() {
|
function open_command() {
|
||||||
local open_cmd
|
local open_cmd
|
||||||
|
|
||||||
# define the open command
|
|
||||||
case "$OSTYPE" in
|
case "$OSTYPE" in
|
||||||
darwin*) open_cmd='open' ;;
|
darwin*) open_cmd='open' ;;
|
||||||
cygwin*) open_cmd='cygstart' ;;
|
cygwin*) open_cmd='cygstart' ;;
|
||||||
|
@ -34,92 +21,26 @@ function open_command() {
|
||||||
${=open_cmd} "$@" &>/dev/null
|
${=open_cmd} "$@" &>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Get the value of an alias.
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1. alias - The alias to get its value from
|
|
||||||
# STDOUT:
|
|
||||||
# The value of alias $1 (if it has one).
|
|
||||||
# Return value:
|
|
||||||
# 0 if the alias was found,
|
|
||||||
# 1 if it does not exist
|
|
||||||
#
|
|
||||||
function alias_value() {
|
function alias_value() {
|
||||||
(( $+aliases[$1] )) && echo $aliases[$1]
|
(( $+aliases[$1] )) && echo $aliases[$1]
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Try to get the value of an alias,
|
|
||||||
# otherwise return the input.
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1. alias - The alias to get its value from
|
|
||||||
# STDOUT:
|
|
||||||
# The value of alias $1, or $1 if there is no alias $1.
|
|
||||||
# Return value:
|
|
||||||
# Always 0
|
|
||||||
#
|
|
||||||
function try_alias_value() {
|
function try_alias_value() {
|
||||||
alias_value "$1" || echo "$1"
|
alias_value "$1" || echo "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Set variable "$1" to default value "$2" if "$1" is not yet defined.
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1. name - The variable to set
|
|
||||||
# 2. val - The default value
|
|
||||||
# Return value:
|
|
||||||
# 0 if the variable exists, 3 if it was set
|
|
||||||
#
|
|
||||||
function default() {
|
function default() {
|
||||||
(( $+parameters[$1] )) && return 0
|
(( $+parameters[$1] )) && return 0
|
||||||
typeset -g "$1"="$2" && return 3
|
typeset -g "$1"="$2" && return 3
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Set environment variable "$1" to default value "$2" if "$1" is not yet defined.
|
|
||||||
#
|
|
||||||
# Arguments:
|
|
||||||
# 1. name - The env variable to set
|
|
||||||
# 2. val - The default value
|
|
||||||
# Return value:
|
|
||||||
# 0 if the env variable exists, 3 if it was set
|
|
||||||
#
|
|
||||||
function env_default() {
|
function env_default() {
|
||||||
(( ${${(@f):-$(typeset +xg)}[(I)$1]} )) && return 0
|
(( ${${(@f):-$(typeset +xg)}[(I)$1]} )) && return 0
|
||||||
export "$1=$2" && return 3
|
export "$1=$2" && return 3
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Required for $langinfo
|
|
||||||
zmodload zsh/langinfo
|
zmodload zsh/langinfo
|
||||||
|
|
||||||
# URL-encode a string
|
|
||||||
#
|
|
||||||
# Encodes a string using RFC 2396 URL-encoding (%-escaped).
|
|
||||||
# See: https://www.ietf.org/rfc/rfc2396.txt
|
|
||||||
#
|
|
||||||
# By default, reserved characters and unreserved "mark" characters are
|
|
||||||
# not escaped by this function. This allows the common usage of passing
|
|
||||||
# an entire URL in, and encoding just special characters in it, with
|
|
||||||
# the expectation that reserved and mark characters are used appropriately.
|
|
||||||
# The -r and -m options turn on escaping of the reserved and mark characters,
|
|
||||||
# respectively, which allows arbitrary strings to be fully escaped for
|
|
||||||
# embedding inside URLs, where reserved characters might be misinterpreted.
|
|
||||||
#
|
|
||||||
# Prints the encoded string on stdout.
|
|
||||||
# Returns nonzero if encoding failed.
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# omz_urlencode [-r] [-m] [-P] <string>
|
|
||||||
#
|
|
||||||
# -r causes reserved characters (;/?:@&=+$,) to be escaped
|
|
||||||
#
|
|
||||||
# -m causes "mark" characters (_.!~*''()-) to be escaped
|
|
||||||
#
|
|
||||||
# -P causes spaces to be encoded as '%20' instead of '+'
|
|
||||||
function omz_urlencode() {
|
function omz_urlencode() {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
zparseopts -D -E -a opts r m P
|
zparseopts -D -E -a opts r m P
|
||||||
|
|
Loading…
Add table
Reference in a new issue