From fd3cf0e4d03cad3df6c74ce01b720ee066f3dd3c Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 23 Dec 2018 11:20:18 -0500 Subject: [PATCH] Added Zim and Zsh configurations --- .gitmodules | 3 ++ .zim | 1 + .zimrc | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .zlogin | 8 +++++ .zshrc | 67 +++++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+) create mode 160000 .zim create mode 100644 .zimrc create mode 100644 .zlogin create mode 100644 .zshrc diff --git a/.gitmodules b/.gitmodules index ff2a363..a6144cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule ".tmux/plugins/tpm"] path = .tmux/plugins/tpm url = https://git.linux-help.org/psi-jack/tpm.git +[submodule ".zim"] + path = .zim + url = https://git.linux-help.org/psi-jack/zimfw.git diff --git a/.zim b/.zim new file mode 160000 index 0000000..21696a4 --- /dev/null +++ b/.zim @@ -0,0 +1 @@ +Subproject commit 21696a4f703a170e93a2f99a5576f37eb4e5a733 diff --git a/.zimrc b/.zimrc new file mode 100644 index 0000000..06e7b81 --- /dev/null +++ b/.zimrc @@ -0,0 +1,96 @@ + + +################# +# CORE SETTINGS # +################# + +# +# Zim settings +# + +# Select what modules you would like enabled. +# The second line of modules may depend on options set by modules in the first +# line. These dependencies are noted on the respective module's README.md. +zmodules=(directory environment git git-info history input utility custom \ + syntax-highlighting history-substring-search prompt completion) + + +################### +# MODULE SETTINGS # +################### + +# +# Prompt +# + +# Set your desired prompt here +zprompt_theme='eriner' + +# +# Completion +# + +# set an optional host-specific filename for the completion cache file +# if none is provided, the default '.zcompdump' is used. +#zcompdump_file=".zcompdump-${HOST}-${ZSH_VERSION}" + +# +# Utility +# + +# Uncomment to enable command correction prompts +# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput +#setopt CORRECT + +# +# Environment +# + +# Set the string below to the desired terminal title format string. +# The terminal title is redrawn upon directory change, however, variables like +# ${PWD} are only evaluated once. Use prompt expansion strings for dynamic data: +# http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes +# The example below uses the following format: 'username@host:/current/directory' +ztermtitle='%n@%m:%~' + +# +# Input +# + +# Uncomment to enable double-dot expansion. +# This appends '../' to your input for each '.' you type after an initial '..' +#zdouble_dot_expand='true' + +# +# Syntax-Highlighting +# + +# This determines what highlighters will be used with the syntax-highlighting module. +# Documentation of the highlighters can be found here: +# https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md +# For (u)rxvt, termite and gnome-terminal users, +# removing the 'cursor' highlighter will fix the disappearing cursor problem +#zhighlighters=(main brackets cursor) +zhighlighters=(main brackets) + + +# +# SSH +# + +# Load these ssh identities with the ssh module +#zssh_ids=(id_rsa) + + +# +# Pacman +# + +# Set (optional) pacman front-end. +#zpacman_frontend='powerpill' +#zpacman_frontend='pacmatic' + +# Load any helper scripts as defined here +#zpacman_helper=(aur) +#zpacman_helper=(aur) + diff --git a/.zlogin b/.zlogin new file mode 100644 index 0000000..a9af863 --- /dev/null +++ b/.zlogin @@ -0,0 +1,8 @@ + + +# +# User configuration sourced by login shells +# + +# Initialize zim +[[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..a94b104 --- /dev/null +++ b/.zshrc @@ -0,0 +1,67 @@ +#if [[ -f /etc/solus-release ]]; then +# if [[ $TILIX_ID || $VTE_VERSION ]]; then +# echo "Loading VTE extensions..." +# source /usr/share/defaults/etc/profile.d/vte.sh +# fi +#fi +#precmd_functions+=(__vte_osc7) + + +# +# User configuration sourced by interactive shells +# +typeset -U PATH +export PATH + +# Change default zim location +export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim + +# Start zim +[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh + +# Fix the ESC+Backspace +bindkey -e +bindkey -e "^[[1;5C" forward-word +bindkey -e "^[[1;5D" backward-word + +# Default Environment +export EDITOR=vim +export VISUAL=vim +export PAGER=less +export BORG_REPO=/mnt/backups/psi-jack/borg + +#function custom_prompt() { +# VTE_PWD_THING="$(__vte_osc7)" +# PS1="$PS1$VTE_PWD_THING" +#} + +if [[ -f /etc/solus-release ]]; then + export SSH_ASKPASS=/usr/lib64/seahorse/seahorse/ssh-askpass + + if [[ $TILIX_ID || $VTE_VERSION ]]; then + source /usr/share/defaults/etc/profile.d/vte.sh + precmd_functions+=(__vte_osc7) + fi +fi + +# Set GPG TTY +#export GPG_TTY=$(tty) + +# Refresh gpg-agent tty in case user switches into an X session +#gpg-connect-agent updatestartuptty /bye >/dev/null + +# Update SSH Agent Socket +#unset SSH_AGENT_PID +#if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then +# export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +#fi + +# Disable Ctrl+S Scroll-Locking +stty -ixon + +# Include local functions/aliases/environments: +while read f +do + source "$f" +done < <(find "${HOME}/.local/dotfiles/" -type f -name '*.zsh') +