got rid of zsh stuff I don't use; i3lock now uses active colorscheme; fixed color7 on halloween theme

This commit is contained in:
2022-08-23 17:44:56 -06:00
parent 2571cf4fe5
commit caf69459e2
8 changed files with 83 additions and 113 deletions

View File

@ -1,75 +1,22 @@
#!/bin/zsh
# ---------------------------------------------------------------------
alias restart='clear; source ~/.zshrc; echo'
#####################################################################
alias pd='pushd';
alias qd='popd';
alias lspd='dirs';
alias pd='pushd'
alias qd='popd'
alias lsd='dirs'
alias bp='bpython';
alias pdo='pwd | xclip' # [p]aste [d]irectory [o]n clipboard
alias cdo='cd $(xclip -o)' # [c]hange to [d]irectory [o]n clipboard
alias pdo='pwd | xclip'; # [p]aste current [d]irectory [o]n clipboard
alias cdo='cd $(xclip -o)'; # [cd] to directory [o]n clipboard
alias readable-date='date +"%A %B %d, %Y"'
alias restart='clear; source ~/.zshrc'
alias fix='vim $(git diff --name-only | uniq) -p'
alias i3-config-update="$DOTWRYN/bin/i3/update-local-config"
#####################################################################
command -v bat >/dev/null 2>&1 && alias cat='bat --style="plain"'
# ---------------------------------------------------------------------
alias erg='EDIT_RIP_GREP_FILE_MATCHES';
EDIT_RIP_GREP_FILE_MATCHES() {
[ $EDITOR = "vim" ] \
&& $EDITOR -p $(rg --color=never -l $1 ) \
|| $EDITOR $(rg --color=never -l $1) ;
}
#####################################################################
# ---------------------------------------------------------------------
alias -s mp4=google-chrome-stable
alias -s pdf=google-chrome-stable
# ---------------------------------------------------------------------
alias gdrive="RCLONE_GOOGLE_DRIVE_MOUNT"
alias gphotos="RCLONE_GOOGLE_PHOTOS_MOUNT"
RCLONE_GOOGLE_DRIVE_MOUNT() {
local REMOTE_NAME='google-drive';
local MOUNT_POINT="$HOME/GoogleDrive";
local TITLE="GOOGLE DRIVE CONNECTION";
local MOUNT_FOLDER_EXTENSION="$1";
RCLONE_GOOGLE_MOUNT "$REMOTE_NAME" "$MOUNT_POINT" "$TITLE" "$MOUNT_FOLDER_EXTENSION";
}
RCLONE_GOOGLE_PHOTOS_MOUNT() {
local REMOTE_NAME='google-photos';
local MOUNT_POINT="$HOME/GooglePhotos";
local TITLE="GOOGLE PHOTOS CONNECTION";
RCLONE_GOOGLE_MOUNT "$REMOTE_NAME" "$MOUNT_POINT" "$TITLE";
}
RCLONE_GOOGLE_MOUNT() {
local REMOTE_NAME="$1";
local MOUNT_POINT="$2";
local TITLE="$3";
local MOUNT_FOLDER_EXTENSION="$4";
[ -d $MOUNT_POINT ] && [[ $(ls $MOUNT_POINT | wc -l) -gt 0 ]] \
&& { echo "connection already active at '$MOUNT_POINT'"; return 1; }
clear;
figlet -w $(tput cols) "$TITLE"| lolcat;
echo -e "\e[3m(C-c to close)\e[0m";
mkdir $MOUNT_POINT >/dev/null 2>&1;
rclone mount "$REMOTE_NAME:$MOUNT_FOLDER_EXTENSION" "$MOUNT_POINT"
rmdir $MOUNT_POINT >/dev/null 2>&1;
}
alias erg='EDIT_RIPGREP_FILE_MATCHES'
EDIT_RIPGREP_FILE_MATCHES() { $EDITOR $(rg --color=never -l $@); }

View File

@ -1,5 +1,5 @@
#!/bin/zsh
# ---------------------------------------------------------------------
#####################################################################
HISTFILE=~/.histfile
HISTSIZE=1000
@ -13,20 +13,20 @@ bindkey -v
bindkey '^R' history-incremental-search-backward
autoload edit-command-line
zle -N edit-command-line;
bindkey -M vicmd v edit-command-line;
zle -N edit-command-line
bindkey -M vicmd v edit-command-line
# ---------------------------------------------------------------------
#####################################################################
zmodload -i zsh/complist;
zmodload -i zsh/complist
zstyle ':completion:*' completer _complete _ignored _approximate
zstyle ':completion:*' max-errors 1
zstyle ':completion:*' menu select;
bindkey -M menuselect '^M' .accept-line; # don't require 'return' to select menu item
zstyle ':completion:*' menu select
bindkey -M menuselect '^M' .accept-line
autoload -Uz compinit
compinit
# ---------------------------------------------------------------------
#####################################################################
which kitty >/dev/null && kitty + complete setup zsh | source /dev/stdin

19
zsh/rc
View File

@ -1,12 +1,13 @@
#!/bin/zsh
source "$HOME/.config/wryn/env.zsh"
# ---------------------------------------------------------------------
#####################################################################
INTERNAL_PLUGINS=(
"$DOTWRYN/zsh/config" # must load first
$(find "$DOTWRYN/zsh" -maxdepth 1 -type f \
! -name 'rc' \
! -name 'config' \
)
$(find "$DOTWRYN/zsh" -mindepth 1 -maxdepth 1 -type f \
| grep -v '/rc$' \
| grep -v '/config$' \
| grep -v '/\.[^/]\+$' \
)
)
SET_PREFERRED_EDITOR() {
@ -29,13 +30,13 @@ SET_PREFERRED_EDITOR() {
&& break
done
export EDITOR="$AVAILABLE_EDITOR";
export VISUAL="$AVAILABLE_EDITOR";
export EDITOR="$AVAILABLE_EDITOR"
export VISUAL="$AVAILABLE_EDITOR"
}
# ---------------------------------------------------------------------
#####################################################################
for p in $INTERNAL_PLUGINS; do source $p; done
for p in $EXTERNAL_PLUGINS; do [ -f $p ] && source $p; done
SET_PREFERRED_EDITOR
WELCOME
# ---------------------------------------------------------------------
#####################################################################
true