modificato: Xresources

modificato:             bashrc
modificato:             etc/profile.d/blackpearl.sh
modificato:             xprofile

diff --git a/Xresources b/Xresources
index f814b41..3a0887a 100644 (file)
--- a/Xresources
+++ b/Xresources
@@ -59,8 +59,10 @@ XTerm*reverseVideo: on
 XTerm*selectToClipboard: true
 
 URxvt*termName: rxvt-unicode-256color
 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
 URxvt.geometry: 120x30
 URxvt.depth: 32
 URxvt.letterSpace: 1

diff --git a/bashrc b/bashrc
index f6a2be9..0599652 100644 (file)
--- 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
 # 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 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"
 
 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"
 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
 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
 fi

-GPG_TTY=$(tty)
-export GPG_TTY
+export GPG_TTY=$(tty)

 if [ -x "$(which gpg-connect-agent)" ]; then
 if [ -x "$(which gpg-connect-agent)" ]; then

-       gpg-connect-agent updatestartuptty /bye >& /dev/null
+       gpg-connect-agent updatestartuptty /bye > /dev/null

 fi
 
 mount-fs () {
 fi
 
 mount-fs () {

diff --git a/etc/profile.d/blackpearl.sh b/etc/profile.d/blackpearl.sh
index d503bf8..f4893ca 100644 (file)
--- 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)
        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"
 
        # Define or colors
        CYAN="\e[1;36m"


@@ -29,26 +30,26 @@ function OUTPUT () {
 
 
        echo -e "$ORANGE"
 
 
        echo -e "$ORANGE"

-       echo -e "                    .                            ${CYAN}/> /${ORANGE}"
-       echo -e "                   oW                           ${CYAN}/ </${ORANGE}"
-       echo -e "         .'        dN                          ${CYAN}/> /${ORANGE}"
-       echo -e "          c0;    ....       .;cdo.            ${CYAN}/ </\t${USER_COLOR}$USER ${CLEAR}@ ${BLUE}$HOST${ORANGE}"
-       echo -e "            . x0kocclodddc..;,.              ${CYAN}/> /${ORANGE}"
-       echo -e "             ,M,         .;dx.              ${CYAN}/ </ ${MAGENTA}OS:\t\t${WHITE}${OS}${ORANGE}"
-       echo -e "             cM.;:0dll'     ,W;            ${CYAN}/> /\t ${MAGENTA}KERNEL:\t${WHITE}$K_v - $K_ar${ORANGE}"
-       echo -e "             xW x . .'ldc.  'Wd           ${CYAN}/ </\t ${MAGENTA}LOAD AVG:\t${WHITE}${LOAD}${ORANGE}"
-       echo -e "             KK k  .::;.  ;OK:.odol:'    ${CYAN}/> /\t ${MAGENTA}PACKAGES:\t${WHITE}${PKGS}${ORANGE}"
-       echo -e "            .Ml.d.:;  .;kXo.       ..   ${CYAN}/ </\t ${MAGENTA}SHELL:\t\t${WHITE}${SHELL}${ORANGE}"
-       echo -e "            'x...xldkOkl.              ${CYAN}/> /\t ${MAGENTA}DE:\t\t${WHITE}${DE}${ORANGE}"
-       echo -e "           .0xdxxd'                   ${CYAN}/ </${ORANGE}"
-       echo -e "            KWXxo                    ${CYAN}/> / ${ORANGE}"
-       echo -e "            ..                      ${CYAN}/ </  ${ORANGE}"
+       echo -e "                    .                                  ${CYAN},/${ORANGE}"
+       echo -e "                   oW                                ${CYAN},'/${ORANGE}"
+       echo -e "         .'        dN                              ${CYAN},' /${ORANGE}"
+       echo -e "          c0;    ....       .;cdo.               ${CYAN},'  /\t${USER_COLOR}$USER ${CLEAR}@ ${BLUE}$HOST${ORANGE}"
+       echo -e "            . x0kocclodddc..;,.                ${CYAN},'   /${ORANGE}"
+       echo -e "             ,M,         .;dx.               ${CYAN},'    /______,\t${MAGENTA}OS:\t\t${WHITE}${OS}${ORANGE}"
+       echo -e "             cM.;:0dll'     ,W;            ${CYAN},'           ,'\t${MAGENTA}KERNEL:\t\t${WHITE}$K_v - $K_ar${ORANGE}"
+       echo -e "             xW x . .'ldc.  'Wd          ${CYAN}.'_____      ,'\t${MAGENTA}LOAD AVG:\t${WHITE}${LOAD}${ORANGE}"
+       echo -e "             KK k  .::;.  ;OK:.odol:'          ${CYAN}/    ,'\t\t${MAGENTA}PACKAGES:\t${WHITE}${PKGS}${ORANGE}"
+       echo -e "            .Ml.d.:;  .;kXo.       ..         ${CYAN}/   ,'\t\t${MAGENTA}SHELL:\t\t${WHITE}${SHELL}${ORANGE}"
+       echo -e "            'x...xldkOkl.                    ${CYAN}/  ,'\t\t${MAGENTA}USERS:\t\t${WHITE}${USERS}${ORANGE}"
+       echo -e "           .0xdxxd'                         ${CYAN}/ ,'${ORANGE}"
+       echo -e "            KWXxo                          ${CYAN}/,'${ORANGE}"
+       echo -e "            ..                            ${CYAN}/'${ORANGE}"

        # reset colours
        echo -en "$CLEAR"
        echo
 }
 
        # reset colours
        echo -en "$CLEAR"
        echo
 }
 

-RUN IT!!
+# RUN IT!!

 case $- in
 *i* )  # We're interactive
   clear
 case $- in
 *i* )  # We're interactive
   clear

diff --git a/xprofile b/xprofile
index d0f961e..670f77c 100644 (file)
--- a/xprofile
+++ b/xprofile
@@ -2,15 +2,15 @@
 
 xbacklight -set 100 &
 # ~/.fehbg &
 
 xbacklight -set 100 &
 # ~/.fehbg &

-~/bin/wallpaper.sh &
+~/bin/wallpaper.sh ~/Pictures/wallpapers/Chrome_OS_Wallpapers_Late_2020/Element_by_Rutger_Paulusse/ &

 #wicd-client --tray &
 #lxqt-powermanagement &
 setxkbmap -layout it &
 numlockx &
 #wicd-client --tray &
 #lxqt-powermanagement &
 setxkbmap -layout it &
 numlockx &

-syndaemon -k -i 2 -d &
+syndaemon -K -t -R -i 2 -d &

 #xautolock -time 10 -locker i3lock-wrapper -notify 30 -notifier "notify-send 'locking the system' '30 seconds before locking system.' --icon=dialog-warning" &
 compton --dbus --config ~/.config/compton.conf &
 #xautolock -time 10 -locker i3lock-wrapper -notify 30 -notifier "notify-send 'locking the system' '30 seconds before locking system.' --icon=dialog-warning" &
 compton --dbus --config ~/.config/compton.conf &

-conky -c ~/.config/conky/qlocktwo.conkyrc &
+#conky -c ~/.config/conky/qlocktwo.conkyrc &

 xdg-user-dirs-update &
 
 
 xdg-user-dirs-update &