Compare commits

..

No commits in common. "c9aab14f1023575e3f2271775f59abb4329d6a99" and "40ca0e9ae406685b262e215ec9848d082ba833fd" have entirely different histories.

5 changed files with 11 additions and 20 deletions

View file

@ -68,8 +68,6 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
[ -x "$(command -v exa)" ] && alias ls='exa -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first' [ -x "$(command -v exa)" ] && alias ls='exa -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first'
[ -x "$(command -v moar)" ] && alias less='moar'
[ -x "$(command -v rmtrash)" ] && alias rm='rmtrash' [ -x "$(command -v rmtrash)" ] && alias rm='rmtrash'
[ -x "$(command -v rmdirtrash)" ] && alias rmdir='rmdirtrash' [ -x "$(command -v rmdirtrash)" ] && alias rmdir='rmdirtrash'

View file

@ -37,7 +37,7 @@ conky.config = {
draw_outline = false, draw_outline = false,
draw_shades = false, draw_shades = false,
use_xft = true, use_xft = true,
font = 'JetBrains Mono Nerd Font:size=15', font = 'JetBrains Mono:size=15',
gap_x = 490, gap_x = 490,
gap_y = 30, gap_y = 30,
minimum_height = 0, minimum_height = 0,

View file

@ -37,7 +37,7 @@ conky.config = {
draw_outline = false, draw_outline = false,
draw_shades = false, draw_shades = false,
use_xft = true, use_xft = true,
font = 'JetBrains Mono Nerd Font:size=40', font = 'JetBrains Mono:size=40',
gap_x = 1080, gap_x = 1080,
gap_y = 30, gap_y = 30,
minimum_height = 0, minimum_height = 0,

View file

@ -37,7 +37,7 @@ conky.config = {
draw_outline = false, draw_outline = false,
draw_shades = false, draw_shades = false,
use_xft = true, use_xft = true,
font = 'JetBrains Mono Nerd Font:size=13', font = 'JetBrains Mono:size=13',
gap_x = 30, gap_x = 30,
gap_y = 30, gap_y = 30,
minimum_height = 400, minimum_height = 400,
@ -76,18 +76,15 @@ ${top name 3} $alignr ${top cpu 3}%
${top name 4} $alignr ${top cpu 4}% ${top name 4} $alignr ${top cpu 4}%
${top name 5} $alignr ${top cpu 5}% ${top name 5} $alignr ${top cpu 5}%
${cpugraph cpu0 100,400} ${cpugraph cpu0 100,400}${voffset -19}
${voffset -22}${cpugraph cpu1 50,200}${cpugraph cpu2 50,200} ${cpugraph cpu1 50,200}${cpugraph cpu2 50,200}${voffset -19}
${voffset -22}${cpugraph cpu3 50,200}${cpugraph cpu4 50,200} ${cpugraph cpu3 50,200}${cpugraph cpu4 50,200}${voffset -19}
${voffset -22}${cpugraph cpu5 50,200}${cpugraph cpu6 50,200} ${cpugraph cpu5 50,200}${cpugraph cpu6 50,200}${voffset -19}
${voffset -22}${cpugraph cpu7 50,200}${cpugraph cpu8 50,200} ${cpugraph cpu7 50,200}${cpugraph cpu8 50,200}
\ ${voffset -230}${color3}${goto 8}1 ${goto 208}2 ${voffset 54}${goto 8}3 ${goto 208}4 ${voffset 54}${goto 8}5 ${goto 208}6 ${voffset 54}${goto 8}7 ${goto 208}8
${color3}${voffset -215}\ ${voffset -186}${color3}${goto 130}${freq_g (1)}GHz ${goto 330}${freq_g (2)}GHz ${voffset 54}${goto 130}${freq_g (3)}GHz ${goto 330}${freq_g (4)}GHz ${voffset 54}${goto 130}${freq_g (5)}GHz ${goto 330}${freq_g (6)}GHz ${voffset 54}${goto 130}${freq_g (7)}GHz ${goto 330}${freq_g (8)}GHz
${goto 8}1 ${goto 130}${freq_g (1)}GHz ${goto 208}2 ${goto 330}${freq_g (2)}GHz ${voffset 50}\
${goto 8}3 ${goto 130}${freq_g (3)}GHz ${goto 208}4 ${goto 330}${freq_g (4)}GHz ${voffset 50}\
${goto 8}5 ${goto 130}${freq_g (5)}GHz ${goto 208}6 ${goto 330}${freq_g (6)}GHz ${voffset 50}\
${goto 8}7 ${goto 130}${freq_g (7)}GHz ${goto 208}8 ${goto 330}${freq_g (8)}GHz ${voffset 50}\
${voffset 15}
${color2}RAM ${color0}${alignr}${mem} ${color2}RAM ${color0}${alignr}${mem}
${membar 5,} ${membar 5,}
${top_mem name 1} $alignr ${top_mem mem_res 1} ${top_mem name 1} $alignr ${top_mem mem_res 1}

View file

@ -36,8 +36,6 @@ export HOSTNAME="$_hostname"
export KUBECONFIG="$HOME/.kube/config" export KUBECONFIG="$HOME/.kube/config"
export LOCALE_ARCHIVE="/usr/lib/locale/locale-archive"
export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc" export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
_makeflags=$(grep -c ^processor /proc/cpuinfo) _makeflags=$(grep -c ^processor /proc/cpuinfo)
export MAKEFLAGS="-j$_makeflags" export MAKEFLAGS="-j$_makeflags"
@ -74,8 +72,6 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
### conditionals ### conditionals
[ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'" [ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
[ -x "$(command -v moar)" ] && export MANPAGER="moar"
[ -x "$(command -v moar)" ] && export PAGER="moar"
set -a set -a
[ -f "$HOME/.config/environment.local" ] && . "$HOME/.config/environment.local" [ -f "$HOME/.config/environment.local" ] && . "$HOME/.config/environment.local"