From 3a106841bad8c93a26d51419e1b7297c97775763 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Thu, 21 Jun 2018 23:56:32 -0400 Subject: [PATCH] Updated to work with Solus --- gitconfig | 2 ++ pam_environment | 5 ++--- profile | 6 +++++- tmux.conf.local | 2 +- zimrc | 9 +++++---- zshrc | 33 +++++++++++++++++++++++++++------ 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/gitconfig b/gitconfig index 7274da1..d93168c 100644 --- a/gitconfig +++ b/gitconfig @@ -16,3 +16,5 @@ gpgsign = true [alias] up = !git pull --prune $@ && git submodule update --init --recursive +[credential] + helper = /usr/lib/git/git-core/git-credential-store diff --git a/pam_environment b/pam_environment index 6ff04de..e880ded 100644 --- a/pam_environment +++ b/pam_environment @@ -2,6 +2,5 @@ EDITOR=vim VISUAL=vim #PATH DEFAULT=${PATH}:/home/@{PAM_USER}/bin #PATH DEFAULT=${PATH}:@{HOME}/bin -SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass - -QT_QPA_PLATFORMTHEME=qgnomeplatform +#SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass +#QT_QPA_PLATFORMTHEME=qgnomeplatform diff --git a/profile b/profile index 32b3ab9..887a846 100644 --- a/profile +++ b/profile @@ -1,4 +1,8 @@ +if [[ -f /etc/solus-release ]]; then + source /usr/share/defaults/etc/profile +fi + export EDITOR=vim export PATH=$PATH:$HOME/bin -export QT_QPA_PLATFORMTHEME=qgnomeplatform +#export QT_QPA_PLATFORMTHEME=qgnomeplatform diff --git a/tmux.conf.local b/tmux.conf.local index 18a367f..947bbef 100644 --- a/tmux.conf.local +++ b/tmux.conf.local @@ -270,7 +270,7 @@ set -g mode-keys vi #set -g status-position top # set shell to zsh -set-option -g default-shell /usr/bin/zsh +set-option -g default-shell /bin/zsh # set alt+left/right to switch windows bind -n M-Right next-window diff --git a/zimrc b/zimrc index 21a8759..06e7b81 100644 --- a/zimrc +++ b/zimrc @@ -11,7 +11,7 @@ # 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 pacman \ +zmodules=(directory environment git git-info history input utility custom \ syntax-highlighting history-substring-search prompt completion) @@ -70,7 +70,8 @@ ztermtitle='%n@%m:%~' # 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 cursor) +zhighlighters=(main brackets) # @@ -87,9 +88,9 @@ zhighlighters=(main brackets cursor) # Set (optional) pacman front-end. #zpacman_frontend='powerpill' -zpacman_frontend='pacmatic' +#zpacman_frontend='pacmatic' # Load any helper scripts as defined here #zpacman_helper=(aur) -zpacman_helper=(aur) +#zpacman_helper=(aur) diff --git a/zshrc b/zshrc index fd26e27..a94b104 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,10 @@ +#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) # @@ -23,17 +30,31 @@ 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) +#export GPG_TTY=$(tty) # Refresh gpg-agent tty in case user switches into an X session -gpg-connect-agent updatestartuptty /bye >/dev/null +#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 +#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