diff --git a/.symlinks/conky-configs/conky-laptop.dhall b/.files/conky-config/laptop.dhall similarity index 94% rename from .symlinks/conky-configs/conky-laptop.dhall rename to .files/conky-config/laptop.dhall index f90a2f6..61a8c50 100644 --- a/.symlinks/conky-configs/conky-laptop.dhall +++ b/.files/conky-config/laptop.dhall @@ -17,7 +17,7 @@ let filesystem = let graphics = C.ModType.graphics C.Graphics::{ - , dev_power = "/sys/bus/pci/devices/0000:01:00.0/power/control" + , dev_power = "/sys/bus/pci/devices/0000:01:00.0/power" , show_temp = True , show_clock = True , show_gpu_util = True @@ -47,8 +47,7 @@ let power = let processor = C.ModType.processor C.Processor::{ - , core_rows = 1 - , core_padding = 0 + , core_groups = [ { rows = 1, padding = 0, threads = 2 } ] , show_stats = True , show_plot = True , table_rows = 5 diff --git a/.symlinks/conky-configs/conky-workstation.dhall b/.files/conky-config/workstation.dhall similarity index 100% rename from .symlinks/conky-configs/conky-workstation.dhall rename to .files/conky-config/workstation.dhall diff --git a/dot_config/conky.dhall.tmpl b/dot_config/conky.dhall.tmpl new file mode 100644 index 0000000..2b92de2 --- /dev/null +++ b/dot_config/conky.dhall.tmpl @@ -0,0 +1,5 @@ +{{- if eq .features.conky_alias "laptop" -}} +{{- include ".files/conky-config/laptop.dhall" -}} +{{- else if eq .features.conky_alias "workstation" -}} +{{- include ".bashrc_linux" -}} +{{- end -}} diff --git a/dot_config/symlink_conky.dhall.tmpl b/dot_config/symlink_conky.dhall.tmpl deleted file mode 100644 index 7fed23f..0000000 --- a/dot_config/symlink_conky.dhall.tmpl +++ /dev/null @@ -1 +0,0 @@ -{{ .chezmoi.sourceDir }}/.symlinks/conky-configs/conky-{{ .features.conky_alias }}.dhall