diff --git a/.config/xmobar/scripts/cpu_temp.sh b/.config/xmobar/scripts/cpu_temp.sh index 02fb6d8..70dc8b8 100755 --- a/.config/xmobar/scripts/cpu_temp.sh +++ b/.config/xmobar/scripts/cpu_temp.sh @@ -13,10 +13,10 @@ else fi if [ "$temp" -ge "$temp2" ] ; then - echo "Cpu: $temp°C" + echo "$temp°C" elif [ "$temp" -ge "$temp1" ] ; then - echo "Cpu: $temp°C" + echo "$temp°C" else - echo "Cpu: $temp°C" + echo "$temp°C" fi diff --git a/.config/xmobar/scripts/disk.sh b/.config/xmobar/scripts/disk.sh index a15fa2b..7000c04 100755 --- a/.config/xmobar/scripts/disk.sh +++ b/.config/xmobar/scripts/disk.sh @@ -1,3 +1,3 @@ #!/bin/sh freespace=$(btrfs fi usage / | grep -Po 'Free \(estimated\):.*' | awk '{print $3}') -echo "Disk (Free): $freespace" +echo ": $freespace" diff --git a/.config/xmobar/scripts/gpu_util.sh b/.config/xmobar/scripts/gpu_util.sh deleted file mode 100755 index e963d26..0000000 --- a/.config/xmobar/scripts/gpu_util.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -temp1=50 -temp2=90 - -temp=$(nvidia-smi | grep 'Default' | awk '{print $13}' | sed 's/%//') - -if [ "$temp" -ge "$temp2" ] ; then - echo "Gpu: $temp%" -elif [ "$temp" -ge "$temp1" ] ; then - echo "Gpu: $temp%" -else - echo "Gpu: $temp%" - -fi diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc0 index 019b445..a154e7e 100644 --- a/.config/xmobar/xmobarrc0 +++ b/.config/xmobar/xmobarrc0 @@ -6,6 +6,7 @@ Config {font = "Ubuntu bold 10" , "FiraCode Nerd Font Mono 17" , "FiraCode Nerd Font Mono 10" , "Font Awesome 6 Free Solid 17" + , "Font Awesome 6 Free Solid 13" ] , bgColor = "#2B2E37" , fgColor = "#929AAD" @@ -22,12 +23,11 @@ Config {font = "Ubuntu bold 10" , iconRoot = "/home/afonso/.config/xmobar/xpm/" -- default: "." , commands = [ Run UnsafeXPropertyLog "_XMONAD_LOG_0" - , Run Date "%a, %d %b  %H:%M:%S" "date" 10 + , Run Date "%a, %d %b  %H:%M" "date" 10 , Run Mpris2 "playerctld" ["-t", " - </fc>"] 10 - , Run Memory ["-t","Mem: <fc=#AAC0F0><usedratio></fc>%"] 10 + , Run Memory ["-t","<fn=6></fn> <fc=#AAC0F0><usedratio></fc>%"] 10 , Run Com "/home/afonso/.config/xmobar/scripts/disk.sh" [] "disk" 10 , Run Com "/home/afonso/.config/xmobar/scripts/cpu_temp.sh" [] "cpu" 10 - , Run Com "/home/afonso/.config/xmobar/scripts/gpu_util.sh" [] "gpu" 10 , Run Com "/home/afonso/.config/xmobar/scripts/volume.sh" [] "volume" 10 , Run Com "/home/afonso/.config/xmobar/scripts/bluetooth.sh" [] "bluetooth" 10 , Run Com "/home/afonso/.config/xmobar/scripts/network.sh" [] "network" 10 @@ -49,16 +49,10 @@ Config {font = "Ubuntu bold 10" \ \ \%memory%\ \ \ - \|\ \ \ \%cpu%\ \ \ - \|\ \ \ - \%gpu%\ - \ \ - \|\ - \ \ \%disk%\ \ \ \|\ diff --git a/.xinitrc b/.xinitrc index 11f8419..79a1370 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,52 +1,52 @@ #!/bin/sh -#userresources=$HOME/.Xresources -#usermodmap=$HOME/.Xmodmap -#sysresources=/etc/X11/xinit/.Xresources -#sysmodmap=/etc/X11/xinit/.Xmodmap -# -## merge in defaults and keymaps -# -#if [ -f $sysresources ]; then -# -# -# -# -# -# -# -# xrdb -merge $sysresources -# -#fi -# -#if [ -f $sysmodmap ]; then -# xmodmap $sysmodmap -#fi -# -#if [ -f "$userresources" ]; then -# -# -# -# -# -# -# -# xrdb -merge "$userresources" -# -#fi -# -#if [ -f "$usermodmap" ]; then -# xmodmap "$usermodmap" -#fi -# -## start some nice programs -# -#if [ -d /etc/X11/xinit/xinitrc.d ] ; then -# for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do -# [ -x "$f" ] && . "$f" -# done -# unset f -#fi +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + + + + + + + + xrdb -merge $sysresources + +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + + + + + + + + xrdb -merge "$userresources" + +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi setxkbmap -layout us,pt setxkbmap -option grp:win_space_toggle