From 2885a5cabbf29289c0caa9ea5609d0f30b8ff01a Mon Sep 17 00:00:00 2001 From: Gorden Date: Fri, 25 Nov 2022 09:06:42 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 3 +- bash.bashrc | 6 +- neofetch/neofetch.config | 138 ----------------- synth-shell/synth-shell-greeter.config.new | 166 +++++++++++++++++++++ update-motd.d/00-motd | 2 +- 5 files changed, 172 insertions(+), 143 deletions(-) delete mode 100644 neofetch/neofetch.config create mode 100644 synth-shell/synth-shell-greeter.config.new diff --git a/.etckeeper b/.etckeeper index a7d46b59..5067fde2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -493,8 +493,6 @@ maybe chmod 0644 'modules' maybe chmod 0755 'modules-load.d' maybe chmod 0644 'motd' maybe chmod 0644 'nanorc' -maybe chmod 0644 'neofetch' -maybe chmod 0644 'neofetch/neofetch.config' maybe chmod 0644 'netconfig' maybe chmod 0755 'network' maybe chmod 0755 'network/if-down.d' @@ -691,6 +689,7 @@ maybe chmod 0644 'synth-shell/personal/README.md' maybe chmod 0644 'synth-shell/personal/synth-shell-greeter.andresgongora.config' maybe chmod 0644 'synth-shell/synth-shell-greeter.config' maybe chmod 0644 'synth-shell/synth-shell-greeter.config.default' +maybe chmod 0644 'synth-shell/synth-shell-greeter.config.new' maybe chmod 0644 'synth-shell/synth-shell-prompt.config' maybe chmod 0644 'synth-shell/synth-shell-prompt.config.default' maybe chmod 0644 'synth-shell/synth-shell-prompt.config.new' diff --git a/bash.bashrc b/bash.bashrc index f092bd61..1264a273 100644 --- a/bash.bashrc +++ b/bash.bashrc @@ -25,7 +25,7 @@ fi # If this is an xterm set the title to user@host:dir #case "$TERM" in #xterm*|rxvt*) -# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' +# PROMPT_COMMAND='echo -ne "]0;${USER}@${HOSTNAME}: ${PWD}"' # ;; #*) # ;; @@ -51,12 +51,14 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no /usr/share/command-not-found/command-not-found -- "$1" return $? else - printf "%s: command not found\n" "$1" >&2 + printf "%s: command not found +" "$1" >&2 return 127 fi } fi + ##----------------------------------------------------- ## better-ls if [ -f /usr/local/bin/better-ls.sh ] && [ -n "$( echo $- | grep i )" ]; then diff --git a/neofetch/neofetch.config b/neofetch/neofetch.config deleted file mode 100644 index c596814e..00000000 --- a/neofetch/neofetch.config +++ /dev/null @@ -1,138 +0,0 @@ -# Ansible managed -# Neofetch config file -# https://github.com/dylanaraps/neofetch - - -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "CPU" cpu - info "Memory" memory - info "Local IP" local_ip - info "Users" users - info line_break - info cols - info line_break -} - -# Kernel -kernel_shorthand="on" - -# Distro -distro_shorthand="off" -os_arch="on" - -# Uptime -uptime_shorthand="on" - -# Shell -shell_path="off" -shell_version="on" - -# CPU -speed_type="bios_limit" -speed_shorthand="off" -cpu_brand="on" -cpu_speed="on" -cpu_cores="logical" -cpu_temp="off" - -# GPU -gpu_brand="on" -gpu_type="all" - -# Resolution -refresh_rate="off" - -# Gtk Theme / Icons / Font -gtk_shorthand="off" -gtk2="on" -gtk3="on" - -# IP Address -public_ip_host="http://ident.me" - -# Disk -disk_show=('/') -disk_subtitle="mount" - -# Song -music_player="auto" -song_shorthand="off" - -# Install Date -install_time="on" -install_time_format="12h" - -# Text Colors -colors=(distro) - -# Text Options -bold="on" -underline_enabled="on" -underline_char="-" - -# Color Blocks -block_range=(0 7) -color_blocks="on" -block_width=3 -block_height=1 - -# Progress Bars -bar_char_elapsed="-" -bar_char_total="=" -bar_border="on" -bar_length=15 -bar_color_elapsed="distro" -bar_color_total="distro" -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - -# Backend Settings -image_backend="ascii" -image_source="auto" - -# Ascii Options -ascii_distro="auto" -ascii_colors=(distro) -ascii_bold="on" - -# Image Options -image_loop="off" -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" -crop_mode="normal" -crop_offset="center" -image_size="auto" -gap=3 -yoffset=0 -xoffset=0 -background_color= - -# Scrot Options -scrot="off" -scrot_cmd="auto" -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" -image_host="teknik" - -# Misc Options -stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="3.4.0" \ No newline at end of file diff --git a/synth-shell/synth-shell-greeter.config.new b/synth-shell/synth-shell-greeter.config.new new file mode 100644 index 00000000..1213ffad --- /dev/null +++ b/synth-shell/synth-shell-greeter.config.new @@ -0,0 +1,166 @@ +##============================================================================== +## LOGO +## +## Configure the logo to your liking. You can either use the default or +## set your own ASCII art down below. +## +## - You can either add it as a single line, or multiline (terminated with \). +## - You have to escape backslashes if you want them to show inside your logo. +## Use \\\\ for 1 backslash, \\\\\\\\ for two. All other characters work fine. +## - You can also add individual color codes to the logo using '\e[ ยทยทยท m'. +## - For example: \e[1;31mHello World! prints in bright red. +## - If you want extra spaces between the logo and the status info, just add +## extra spaces at the last line and end it with '\n'. +##============================================================================== + +logo="\e[38;5;213m __ __ + _______ ______ / /_/ /_ + / ___/ / / / __ \/ __/ __ \ + /__ / /_/ / / / / /_/ / / / + /____/\__ /_/ /_/\__/_/ /_/ + /____/ +\e[38;5;45m _____ __ __________ __ + / ___// / / / ____/ / / / + \__ \/ /_/ / __/ / / / / + ___/ / __ / /___/ /___/ /___ +/____/_/ /_/_____/_____/_____/\e[0;39m" + + + +##============================================================================== +## STATUS INFO +## +## Choose what to print and in what order +## Valid options are: +## +## ## SIMPLE ONE-LINERS +## OS Linux distribution name +## KERNEL Kernel version +## CPU CPU Name +## SHELL Shell name +## DATE Current date +## UPTIME System uptime (time since boot) +## USER Current user and host names +## NUMLOGGED Show number of logged in users +## NAMELOGGED Show names of logged in users +## LOCALIPV4 IPv4 +## EXTERNALIPV4 External IPv4 (might be slow) +## SERVICES Summary of failed services +## CPULOAD Sys load average(eg. 0.23, 0.26, 0.27 ) +## CPUTEMP CPU temperature (requires lm-sensors) +## +## ## SYS LOAD MONITORS +## SYSLOAD_MON Current CPU load +## MEMORY_MON Occupied memory +## SWAP_MON Occupied SWAP +## HDDROOT_MON / partition occupied +## HDDHOME_MON /home/user occupied +## CPUTEMP_MON CPU temperature (requires lm-sensors) +## SYSLOAD_MON% Current CPU load in % +## MEMORY_MON% Occupied memory in % +## SWAP_MON% Occupied SWAP in % +## HDDROOT_MON% / partition occupied in % +## HDDHOME_MON% /home/user occupied in % +## +## ## MISC +## SPACER Print decorative spacer (empty line) +## PALETTE Show 16-bit palette (add SPACER before for best results) +## PALETTE_SMALL Show smaller version of 16-bit color palette +## +##============================================================================== + +print_info=" + OS + KERNEL + CPU + GPU + SHELL + DATE + UPTIME + LOCALIPV4 + EXTERNALIPV4 + SERVICES + CPUTEMP + SYSLOAD_MON% + MEMORY_MON + SWAP_MON + HDDROOT_MON + HDDHOME_MON + PALETTE" + + + +##============================================================================== +## COLORS +## +## Control the color and format scheme of the status report. +## -c color: color name or 256bit color code +## -b background color: color name or 256bit color code +## -e effect: bold, blink, dim, underline... +## +## Valid color names (16 bit): +## white, light-gray, dark-gray, black, +## red, green, yellow, blue, magenta, cyan, +## light-red, light-green, light-yellow, light-blue, light-magenta, light-cyan +## +##============================================================================== + +format_info=" -c light-gray " +format_highlight=" -c blue -e bold" +format_crit=" -c 45 -e bold" +format_deco=" -c light-gray " +format_ok=" -c blue -e bold" +format_error=" -c 45 -e bold -e blink" +format_logo=" -c blue -e bold" + + + +##============================================================================== +## STATUS BARS +## +## These option controls the behaviour of the visual status bars that are +## plotted for CPU, Memory, Swap and HDD usage. You can set the percentage that +## determines when the current usage is deemed critical. If said percentage +## is surpassed, the color of the bars will change and extra information +## might be plotted in addition (e.g. if the CPU usage is too high, the most +## demanding processes are printed to terminal). +##============================================================================== + +bar_cpu_crit_percent=40 +bar_ram_crit_percent=75 +bar_swap_crit_percent=25 +bar_hdd_crit_percent=85 +bar_home_crit_percent=85 + +bar_ram_units="MB" +bar_swap_units="MB" +bar_hdd_units="GB" +bar_home_units="GB" + +cpu_crit_print=true +cpu_crit_print_num=3 +ram_crit_print=true +ram_crit_print_num=3 + +bar_length=9 # Number of characters that comprise a bar +bar_num_digits=5 # Control num digits next to bar +bar_padding_after=0 # Extra spaces after bar +info_label_width=16 # Desired length of the info labels +bar_bracket_char_left='[' +bar_bracket_char_right=']' +bar_fill_char='|' +bar_background_char=' ' + + +##============================================================================== +## OTHERS +## +## For date format setup, see `man date` +##============================================================================== + +print_cols_max=100 # Keep logo and info text together +print_logo_right=false # Change where the logo is plotted +date_format="%Y.%m.%d - %T" # see 'man date' +clear_before_print=false # Dangerous if true, some messages might be lost +print_extra_new_line_top=true # Extra line before logo and info +print_extra_new_line_bot=true # Extra line after logo and info diff --git a/update-motd.d/00-motd b/update-motd.d/00-motd index 0917031d..e6838533 100755 --- a/update-motd.d/00-motd +++ b/update-motd.d/00-motd @@ -1,4 +1,4 @@ #!/bin/bash # Ansible managed -/usr/bin/neofetch --config /etc/neofetch/neofetch.config \ No newline at end of file +#/usr/bin/neofetch --config /etc/neofetch/neofetch.config