salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Misc: Fix merge conflicts

Browse Source
This commit is contained in:
Salt 2019-03-22 04:16:41 -05:00
commit c80248825e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.config/conky/conky.conf
View File

@ -35,6 +35,7 @@ conky.config = {
gap_y = 32,
format_human_readable = true,
temperature_unit = "celsius",
if_up_strictness = "link",
default_bar_height = 11,
@ -48,7 +49,7 @@ conky.config = {
conky.text = [[
${image ~/.face -s 64x64}${font Noto Sans:style=Light:size=30}$alignr${no_update $nodename_short}$font
${font Noto Sans:style=Light:size=17}$alignr${time %I:%M %p}$font
${font Noto Sans:style=Light:size=12}$alignr${time %A, %B %d, %Y}$font
${font Noto Sans:style=Light:size=12}${acpitemp}°C$alignr${time %A, %B %d, %Y}$font
${color3}$hr$color
${font Noto Sans:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu%
${color8}${cpugraph cpu1 20,200} ${cpugraph cpu2 20,200}

1
.config/i3/config
View File

@ -48,6 +48,7 @@ for_window [class="Spotify"] move to workspace $w8
for_window [class="Audacious"] move to workspace $w8
for_window [title="Minecraft 1.7.10"] fullscreen enable
for_window [title="Minecraft 1.12.2"] fullscreen enable
for_window [class="explorer.exe"] fullscreen enable
for_window [class="plasmashell"] kill, floating enable, border none
for_window [class="pavucontrol-qt"] floating enable, sticky enable