Merge branch 'desktop'

merge into master, since the distinction is no longer neccessary

1 files changed, 39 insertions, 23 deletions

diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
index 149ab2e..b1c0964 100644
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -1,31 +1,47 @@
 # See this wiki page for more info
 # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
+
 print_info() {
     info title
-    # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')"
-    prin "${cl9}┌────────────────────────────────────────────────────┐"
-    info "\n \n  " distro
-    info "\n \n  " model
-    info "\n \n  " kernel
-    info "\n \n  " uptime
-    info "\n \n  " packages
-    info "\n \n  " shell
-    info "\n \n  " resolution
-    info "\n \n  " wm
-    info "\n \n  " term
-    info "\n \n  " cpu
-    info "\n \n  " gpu
-    info "\n \n  " memory
-    info "\n \n  " disk
-    prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘"
-    prin "\n"
+    prin "$(color 12)╭──────────── $(color 10)Software$(color 12) ────────────────────"
+    info "$(color 12)│ $(color 14)OS" distro
+    info "$(color 12)│ $(color 14)Kernel" kernel
+    info "$(color 12)│ $(color 14)Packages" packages
+    info "$(color 12)│ $(color 14)Shell" shell
+    info "$(color 12)│ $(color 14)WM" wm
+    info "$(color 12)│ $(color 14)Terminal" term
+    prin "$(color 12)├──────────── $(color 10)Hardware$(color 12) ────────────────────"
+    info "$(color 12)│ $(color 14)CPU" cpu
+    info "$(color 12)│ $(color 14)GPU" gpu
+    info "$(color 12)│ $(color 14)Memory" memory
+    info "$(color 12)│ $(color 14)Disk" disk
+    prin "$(color 12)├───────────── $(color 10)Uptime$(color 12) ─────────────────────"
+    info "$(color 12)│" uptime
+    prin "$(color 12)╰──────────────────────────────────────────"
+
+    info cols
 }
 
 reset="\033[0m"
-
+gray="\033[1;90m"
+red="\033[1;31m"
+green="\033[1;32m"
+yellow="\033[1;33m"
+blue="\033[1;34m"
+magenta="\033[1;35m"
+cyan="\033[1;36m"
+white="\033[1;37m"
+
+cl0="${gray}"
+cl1="${red}"
+cl2="${green}"
+cl3="${yellow}"
+cl4="${blue}"
+cl5="${magenta}"
+cl6="${cyan}"
+cl7="${white}"
 cl9="${reset}"
 
-
 # Title
 
 
@@ -364,7 +380,7 @@ gtk3="off"
 # disk_show=('/'):
 #      'Disk (/): 74G / 118G (66%)'
 #
-disk_show=('/' '/home' '/dev/sda2' '/dev/sdb1')
+disk_show=('/' '/dev/sda1' '/dev/sdb1')
 
 # Disk subtitle.
 # What to append to the Disk subtitle.
@@ -388,7 +404,7 @@ disk_show=('/' '/home' '/dev/sda2' '/dev/sdb1')
 # none:   'Disk: 74G / 118G (66%)'
 #         'Disk: 74G / 118G (66%)'
 #         'Disk: 74G / 118G (66%)'
-disk_subtitle="none"
+disk_subtitle="dir"
 
 # Disk percent.
 # Show/Hide disk percent.
@@ -500,7 +516,7 @@ mpc_args=()
 # Example:
 # colors=(distro)      - Text is colored based on Distro colors.
 # colors=(4 6 1 8 8 6) - Text is colored in the order above.
-colors=(201 51 93 5 7 7)
+colors=(distro)
 
 
 # Text Options
@@ -745,7 +761,7 @@ ascii_distro="auto"
 # Example:
 # ascii_colors=(distro)      - Ascii is colored based on Distro colors.
 # ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors.
-ascii_colors=(88 88 88 88 88 88)
+ascii_colors=(distro)
 
 # Bold ascii logo
 # Whether or not to bold the ascii logo.