From 199d69f98ae0e4274a758cb11fb0787cccefbb54 Mon Sep 17 00:00:00 2001 From: q3aql Date: Wed, 2 Mar 2022 23:08:13 +0100 Subject: [PATCH] Dotfiles config update (2022-03-02) --- .bashrc | 4 ++-- .config/fish/config.fish | 8 +++---- .zshrc | 4 ++-- scripts/bash-logo-colors.bash | 6 ++--- scripts/bobby.theme.fish | 5 +++- scripts/brainy.theme.bash | 13 +++++++++++ scripts/brainy.theme.fish | 18 ++++++++++++++ scripts/brainy.theme.zsh | 17 ++++++++++++++ scripts/fish-logo-colors.fish | 44 +++++++++++++++++++++++++++++++++++ scripts/zsh-logo-colors.zsh | 41 ++++++++++++++++++++++++++++++++ 10 files changed, 148 insertions(+), 12 deletions(-) create mode 100755 scripts/brainy.theme.bash create mode 100755 scripts/brainy.theme.fish create mode 100755 scripts/brainy.theme.zsh create mode 100755 scripts/fish-logo-colors.fish create mode 100755 scripts/zsh-logo-colors.zsh diff --git a/.bashrc b/.bashrc index a17d101..3de6949 100644 --- a/.bashrc +++ b/.bashrc @@ -174,7 +174,7 @@ echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m${me echo -e "\e[31m :@: \e[0m" echo -e "\e[31m % \e[0m" echo -e "\e[31m \e[0m" -echo -e "\e[32m # Bienvenido al terminal de ${user_loaded}\e[0m" -echo -e -n "\e[35m # Cargando el terminal / \e[0m" +echo -e "\e[32m # Welcome to terminal of ${user_loaded}\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" echo "" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 54bf687..700e085 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -15,7 +15,7 @@ set cpu_model (echo {$cpu_model} | tr -s " ") set mem_total (lsmem | grep "Total online memory:" | tr -s " " | cut -d ":" -f 2) set mem_total (echo {$mem_total} | cut -f 2) set arch_system (uname -m) -set hostname {$HOSTNAME} +set hostname_host (hostname) set session_type {$XDG_SESSION_TYPE} alias grep='grep --color=auto' @@ -33,7 +33,7 @@ echo -e " " echo -e "\e[31m :. .: \e[0m" echo -e "\e[31m .=: :=. \e[0m" echo -e "\e[31m -+ =- \e[0m \e[33mOS: \e[0m\e[35m$os_system\e[0m" -echo -e "\e[31m :# *- \e[0m \e[33mHost: \e[0m\e[35m$hostname\e[0m" +echo -e "\e[31m :# *- \e[0m \e[33mHost: \e[0m\e[35m$hostname_host\e[0m" echo -e "\e[31m @= :@ \e[0m \e[33mKernel: \e[0m\e[35m$kernel\e[0m" echo -e "\e[31m .@- :@:\e[0m \e[33mUptime: \e[0m\e[35m$uptime\e[0m" echo -e "\e[31m @* *@.\e[0m \e[33mShell: \e[0m\e[35mfish $shell\e[0m" @@ -47,8 +47,8 @@ echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m$mem echo -e "\e[31m :@: \e[0m" echo -e "\e[31m % \e[0m" echo -e "\e[31m \e[0m" -echo -e "\e[32m # Bienvenido al terminal de $user_loaded\e[0m" -echo -e -n "\e[35m # Cargando el terminal / \e[0m" +echo -e "\e[32m # Welcome to terminal of $user_loaded\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" echo "" echo "" diff --git a/.zshrc b/.zshrc index c20f469..998d1db 100644 --- a/.zshrc +++ b/.zshrc @@ -275,6 +275,6 @@ echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m${me echo -e "\e[31m :@: \e[0m" echo -e "\e[31m % \e[0m" echo -e "\e[31m \e[0m" -echo -e "\e[32m # Bienvenido al terminal de ${user_loaded}\e[0m" -echo -e -n "\e[35m # Cargando el terminal / \e[0m" +echo -e "\e[32m # Welcome to terminal of ${user_loaded}\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" echo "" diff --git a/scripts/bash-logo-colors.bash b/scripts/bash-logo-colors.bash index 118c5e5..6e40505 100755 --- a/scripts/bash-logo-colors.bash +++ b/scripts/bash-logo-colors.bash @@ -1,6 +1,6 @@ #!/bin/bash -# Variables para mostrar +# Variables #os_system="Devuan 4" os_system=$(lsb_release -d | tr -s " " | cut -d ":" -f 2) os_system=$(echo ${os_system}) @@ -38,6 +38,6 @@ echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m${me echo -e "\e[31m :@: \e[0m" echo -e "\e[31m % \e[0m" echo -e "\e[31m \e[0m" -echo -e "\e[32m # Bienvenido al terminal de ${user_loaded}\e[0m" -echo -e -n "\e[35m # Cargando el terminal / \e[0m" +echo -e "\e[32m # Welcome to terminal of ${user_loaded}\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" echo "" diff --git a/scripts/bobby.theme.fish b/scripts/bobby.theme.fish index d783c30..37aec51 100755 --- a/scripts/bobby.theme.fish +++ b/scripts/bobby.theme.fish @@ -2,6 +2,9 @@ set TERM xterm-256color +set user_loaded (whoami) +set hostname_host (hostname) + function fish_prompt # interactive user name @ host name, date/time in YYYY-mm-dd format and path set current_dir (pwd) @@ -11,7 +14,7 @@ function fish_prompt echo -e -n "\e[36m$current_date\e[0m " echo -e -n "\e[31m○\e[0m" echo -e -n " " - echo -e -n "\e[35m$user_loaded@$hostname\e[0m in \e[32m$current_dir\e[0m" + echo -e -n "\e[35m$user_loaded@$hostname_host\e[0m in \e[32m$current_dir\e[0m" echo -e "" echo -e "\e[36m○\e[0m \e[32m→\e[0m " end diff --git a/scripts/brainy.theme.bash b/scripts/brainy.theme.bash new file mode 100755 index 0000000..8906eca --- /dev/null +++ b/scripts/brainy.theme.bash @@ -0,0 +1,13 @@ +#!/bin/bash + +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +if [ "$color_prompt" = yes ]; then + PS1="\[\033[01;34m\]\u@\h\[\033[00m\] [\[\033[01;33m\]\w\[\033[00m\]] \[\033[01;32m\]○\[\033[00m\] \[\033[01;35m\][\[\033[00m\]\t\[\033[01;35m\]]\[\033[00m\]\n> " +else + PS1="\u@\h [\w] ○ [\t]\n> " + #PS1="\u@\h [\w] o [\t]\n> " +fi +unset color_prompt force_color_prompt diff --git a/scripts/brainy.theme.fish b/scripts/brainy.theme.fish new file mode 100755 index 0000000..03bf94c --- /dev/null +++ b/scripts/brainy.theme.fish @@ -0,0 +1,18 @@ +#!/usr/bin/fish + +set TERM xterm-256color + +set user_loaded (whoami) +set hostname_host (hostname) + +function fish_prompt + # interactive user name @ host name, date/time in YYYY-mm-dd format and path + set current_dir (pwd) + set current_time (date '+%H:%M:%S') + echo -e -n "\e[34m$user_loaded@$hostname_host\e[0m " + echo -e -n "\e[33m[$current_dir]\e[0m " + echo -e -n "\e[32m○\e[0m " + echo -e -n "\e[35m[\e[0m$current_time\e[35m]\e[0m" + echo -e "" + echo -e "> " +end diff --git a/scripts/brainy.theme.zsh b/scripts/brainy.theme.zsh new file mode 100755 index 0000000..de31c9f --- /dev/null +++ b/scripts/brainy.theme.zsh @@ -0,0 +1,17 @@ +#!/bin/zsh + +# Detect prompt color +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +if [ "$color_prompt" = yes ]; then + PS1="%F{blue}%n@%m %F{default}[%F{yellow}%/%f] %F{green}○ %F{magenta}[%F{default}%*%F{magenta}] +%F{default}> " +else + PS1="%n@%m [%/%f] ○ [%*] +> " + #PS1="%n@%m [%/%f] o [%*] +#> " +fi + diff --git a/scripts/fish-logo-colors.fish b/scripts/fish-logo-colors.fish new file mode 100755 index 0000000..930608f --- /dev/null +++ b/scripts/fish-logo-colors.fish @@ -0,0 +1,44 @@ +#!/usr/bin/fish + +set TERM xterm-256color + +set os_system (lsb_release -d | tr -s " " | cut -d ":" -f 2) +set os_system (echo {$os_system} | cut -f 2) +set kernel (uname -r) +set uptime (uptime | tr -s " " | cut -d "," -f 1) +set uptime (echo {$uptime} | cut -f 2) +#set shell="3.1.2" # Run fish --version +set shell (fish --version | cut -d " " -f 3) +set resolution (xrandr 2> /dev/null | grep "*" | head -1 | tr -s " " | cut -d " " -f 2) +set user_loaded (whoami) +set home_user {$HOME} +set cpu_model (lscpu | grep "Model name:" | tr -s " " | cut -d ":" -f 2) +set cpu_model (echo {$cpu_model} | tr -s " ") +set mem_total (lsmem | grep "Total online memory:" | tr -s " " | cut -d ":" -f 2) +set mem_total (echo {$mem_total} | cut -f 2) +set arch_system (uname -m) +set hostname_host (hostname) +set session_type {$XDG_SESSION_TYPE} + +echo -e " " +echo -e "\e[31m :. .: \e[0m" +echo -e "\e[31m .=: :=. \e[0m" +echo -e "\e[31m -+ =- \e[0m \e[33mOS: \e[0m\e[35m$os_system\e[0m" +echo -e "\e[31m :# *- \e[0m \e[33mHost: \e[0m\e[35m$hostname_host\e[0m" +echo -e "\e[31m @= :@ \e[0m \e[33mKernel: \e[0m\e[35m$kernel\e[0m" +echo -e "\e[31m .@- :@:\e[0m \e[33mUptime: \e[0m\e[35m$uptime\e[0m" +echo -e "\e[31m @* *@.\e[0m \e[33mShell: \e[0m\e[35mfish $shell\e[0m" +echo -e "\e[31m #@* :=++: =@# \e[0m \e[33mResolution: \e[0m\e[35m$resolution\e[0m" +echo -e "\e[31m #@#: *@# .#@% \e[0m \e[33mUser: \e[0m\e[35m$user_loaded\e[0m" +echo -e "\e[31m =%@%=: *@* :=%@@+ \e[0m \e[33mHome: \e[0m\e[35m$home_user\e[0m" +echo -e "\e[31m -#@@@@@@@@@@@%+ \e[0m \e[33mSession: \e[0m\e[35m$session_type\e[0m" +echo -e "\e[31m .=+%@@+=-. \e[0m \e[33mArch: \e[0m\e[35m$arch_system\e[0m" +echo -e "\e[31m *@# \e[0m \e[33mCPU: \e[0m\e[35m$cpu_model\e[0m" +echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m$mem_total\e[0m" +echo -e "\e[31m :@: \e[0m" +echo -e "\e[31m % \e[0m" +echo -e "\e[31m \e[0m" +echo -e "\e[32m # Welcome to terminal of $user_loaded\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" +echo "" +echo "" diff --git a/scripts/zsh-logo-colors.zsh b/scripts/zsh-logo-colors.zsh new file mode 100755 index 0000000..0022a49 --- /dev/null +++ b/scripts/zsh-logo-colors.zsh @@ -0,0 +1,41 @@ +#!/bin/bash + +# Variables +os_system=$(uname -o) +kernel=$(uname -r) +uptime=$(uptime | tr -s " " | cut -d "," -f 1) +uptime=$(echo ${uptime}) +#shell="5.8" # Run zsh --version +shell=$(zsh --version | cut -d " " -f 2) +resolution=$(xrandr 2> /dev/null | grep "*" | head -1 | tr -s " " | cut -d " " -f 2) +user_loaded=$(whoami) +home_user="${HOME}" +cpu_model=$(lscpu | grep "Model name:" | tr -s " " | cut -d ":" -f 2) +cpu_model=$(echo ${cpu_model}) +mem_total=$(lsmem | grep "Total online memory:" | tr -s " " | cut -d ":" -f 2) +mem_total=$(echo ${mem_total}) +arch_system=$(uname -m) +hostname=$(hostname) +session_type="${XDG_SESSION_TYPE}" + +echo -e " " +echo -e "\e[31m :. .: \e[0m" +echo -e "\e[31m .=: :=. \e[0m" +echo -e "\e[31m -+ =- \e[0m \e[33mOS: \e[0m\e[35m${os_system}\e[0m" +echo -e "\e[31m :# *- \e[0m \e[33mHost: \e[0m\e[35m${hostname}\e[0m" +echo -e "\e[31m @= :@ \e[0m \e[33mKernel: \e[0m\e[35m${kernel}\e[0m" +echo -e "\e[31m .@- :@:\e[0m \e[33mUptime: \e[0m\e[35m${uptime}\e[0m" +echo -e "\e[31m @* *@.\e[0m \e[33mShell: \e[0m\e[35mzsh ${shell}\e[0m" +echo -e "\e[31m #@* :=++: =@# \e[0m \e[33mResolution: \e[0m\e[35m${resolution}\e[0m" +echo -e "\e[31m #@#: *@# .#@% \e[0m \e[33mUser: \e[0m\e[35m${user_loaded}\e[0m" +echo -e "\e[31m =%@%=: *@* :=%@@+ \e[0m \e[33mHome: \e[0m\e[35m${home_user}\e[0m" +echo -e "\e[31m -#@@@@@@@@@@@%+ \e[0m \e[33mSession: \e[0m\e[35m${session_type}\e[0m" +echo -e "\e[31m .=+%@@+=-. \e[0m \e[33mArch: \e[0m\e[35m${arch_system}\e[0m" +echo -e "\e[31m *@# \e[0m \e[33mCPU: \e[0m\e[35m${cpu_model}\e[0m" +echo -e "\e[31m +@* \e[0m \e[33mMemory: \e[0m\e[35m${mem_total}\e[0m" +echo -e "\e[31m :@: \e[0m" +echo -e "\e[31m % \e[0m" +echo -e "\e[31m \e[0m" +echo -e "\e[32m # Welcome to terminal of ${user_loaded}\e[0m" +echo -e -n "\e[35m # Loading terminal / \e[0m" +echo ""