From 6a1cebe53b6d80c79a7292997b0aaf6974572147 Mon Sep 17 00:00:00 2001 From: danix Date: Sun, 3 Jan 2021 09:01:43 +0100 Subject: [PATCH] modificato: Xresources modificato: bashrc modificato: etc/profile.d/blackpearl.sh modificato: xprofile --- Xresources | 6 ++++-- bashrc | 33 +++++++++++++++++++-------------- etc/profile.d/blackpearl.sh | 33 +++++++++++++++++---------------- xprofile | 6 +++--- 4 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Xresources b/Xresources index f814b41..3a0887a 100644 --- a/Xresources +++ b/Xresources @@ -59,8 +59,10 @@ XTerm*reverseVideo: on XTerm*selectToClipboard: true URxvt*termName: rxvt-unicode-256color -URxvt.font: xft:Inconsolata:Bold:pixelsize=14 -URxvt.boldFont: xft:Inconsolata:Black:pixelsize=14 +!URxvt.font: xft:Space Mono:Regular:pixelsize=14 +!URxvt.boldFont: xft:Space Mono:Bold:pixelsize=14 +URxvt.font: xft:Source Code Pro:Regular:pixelsize=14 +URxvt.boldFont: xft:Source Code Pro:Bold:pixelsize=14 URxvt.geometry: 120x30 URxvt.depth: 32 URxvt.letterSpace: 1 diff --git a/bashrc b/bashrc index f6a2be9..0599652 100644 --- a/bashrc +++ b/bashrc @@ -1,8 +1,3 @@ -export GIT_PS1_SHOWCOLORHINTS=true -export GIT_PS1_SHOWUNTRACKEDFILES=true -export GIT_PS1_SHOWDIRTYSTATE=true -export GIT_PS1_SHOWSTASHSTATE=true - # turns on bash autocompletion if [ -f /etc/profile.d/bash_completion.sh ]; then . /etc/profile.d/bash_completion.sh @@ -47,12 +42,23 @@ bash_prompt() { local BGC="\[\033[46m\]" local BGW="\[\033[47m\]" - local UC=$EMG # user's color - [ $UID -eq "0" ] && UC=$EMR # root's color + local UC=$EMG + [ $UID -eq "0" ] && UC=$EMR - PS1="${UC}\u ${NONE}@ ${EMB}\h ${NONE}{ ${M}\d ${NONE}} ${G}[ ${NONE}\w ${G}] ${NONE}\n\# ${UC}\\$> ${NONE}" + PS1="${UC}\u ${NONE}@ ${EMB}\h ${NONE}{ ${M}\d ${NONE}} ${W}${BGG}[ \w ]${NONE}\n\#$(__git_ps1) ${UC}\\$> ${NONE}" } -bash_prompt +export PROMPT_COMMAND=bash_prompt + +# turns on git prompt +if [ -f /home/danix/.git-prompt.sh ]; then + GIT_PS1_SHOWDIRTYSTATE=true + GIT_PS1_SHOWSTASHSTATE=true + GIT_PS1_SHOWUNTRACKEDFILES=true + GIT_PS1_SHOWUPSTREAM="auto" + GIT_PS1_HIDE_IF_PWD_IGNORED=true + GIT_PS1_SHOWCOLORHINTS=true + . /home/danix/.git-prompt.sh +fi alias su="su -" alias ls="ls --color -lh" @@ -81,7 +87,7 @@ shopt -s histappend -export PATH=~/.local/bin:~/bin:$PATH +export PATH=~/.config/composer/vendor/bin:~/.local/bin:~/bin:$PATH export INTEL_BATCH=1 export QT_QPA_PLATFORMTHEME="lxqt" export QT_STYLE_OVERRIDE="kvantum-dark" @@ -118,12 +124,11 @@ logdate() { unset GPG_AGENT_INFO unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh" + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi -GPG_TTY=$(tty) -export GPG_TTY +export GPG_TTY=$(tty) if [ -x "$(which gpg-connect-agent)" ]; then - gpg-connect-agent updatestartuptty /bye >& /dev/null + gpg-connect-agent updatestartuptty /bye > /dev/null fi mount-fs () { diff --git a/etc/profile.d/blackpearl.sh b/etc/profile.d/blackpearl.sh index d503bf8..f4893ca 100644 --- a/etc/profile.d/blackpearl.sh +++ b/etc/profile.d/blackpearl.sh @@ -9,7 +9,8 @@ function OUTPUT () { OS=$(cat /etc/slackware-version) LOAD=$(uptime |cut -d " " -f12-) PKGS=$(/bin/ls -1 /var/log/packages/ |wc -l) - DE=$(env |grep DESKTOP_SESSION |cut -d "/" -f5) +# DE=$(env |grep DESKTOP_SESSION |cut -d "/" -f5) + USERS=$(who -s |wc -l) # Define or colors CYAN="\e[1;36m" @@ -29,26 +30,26 @@ function OUTPUT () { echo -e "$ORANGE" - echo -e " . ${CYAN}/> /${ORANGE}" - echo -e " oW ${CYAN}/ /${ORANGE}" - echo -e " c0; .... .;cdo. ${CYAN}/ /${ORANGE}" - echo -e " ,M, .;dx. ${CYAN}/ /\t ${MAGENTA}KERNEL:\t${WHITE}$K_v - $K_ar${ORANGE}" - echo -e " xW x . .'ldc. 'Wd ${CYAN}/ /\t ${MAGENTA}PACKAGES:\t${WHITE}${PKGS}${ORANGE}" - echo -e " .Ml.d.:; .;kXo. .. ${CYAN}/ /\t ${MAGENTA}DE:\t\t${WHITE}${DE}${ORANGE}" - echo -e " .0xdxxd' ${CYAN}/ / ${ORANGE}" - echo -e " .. ${CYAN}/