From ee09e31e7da52aeb27850d975675a0123c8e8ace Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Thu, 11 Aug 2022 00:27:16 -0400
Subject: [PATCH] FIX typos

---
 config/config.dhall   | 18 ++++++++++++------
 config/fallback.dhall | 28 +++++++++++++++-------------
 conky.conf            |  1 -
 src/color.lua         |  1 -
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/config/config.dhall b/config/config.dhall
index 7aca51c..7bc1795 100644
--- a/config/config.dhall
+++ b/config/config.dhall
@@ -58,21 +58,26 @@ let Modules =
       }
 
 let ModType =
-      < fileSystem
+      < filesystem
       | graphics
       | memory
       | network
       | pacman
       | processor
+      | power
       | readwrite
       | system
       >
 
 let Block = < Pad : Natural | Mod : ModType >
 
-let Column = { blocks : List Block, width : Natural }
+let Column_ = { blocks : List Block, width : Natural }
 
-let Panel = { columns : List Column, margins : Margin }
+let Column = < CPad : Natural | CCol : Column_ >
+
+let Panel_ = { columns : List Column, margins : Margin }
+
+let Panel = < PPad : Natural | PPanel : Panel_ >
 
 let Layout = { anchor : Point, panels : List Panel }
 
@@ -113,7 +118,7 @@ let TableGeometry =
         { name_chars = 8
         , padding = { x = 6, y = 15 }
         , header_padding = 20
-        , row_spacing = 13
+        , row_spacing = 16
         }
       }
 
@@ -160,7 +165,7 @@ let Patterns =
               , data : { border : Pattern, fill : Pattern }
               }
           , indicator :
-              { bg : Pattern, fg : { active : Pattern, inactive : Pattern } }
+              { bg : Pattern, fg : { active : Pattern, critical : Pattern } }
           }
       , default =
         { header = Pattern.RGB 0xefefef
@@ -201,7 +206,7 @@ let Patterns =
                   , { color = 0x99CEFF, stop = 0.5 }
                   , { color = 0x316BA6, stop = 1.0 }
                   ]
-            , inactive =
+            , critical =
                 Pattern.GradientRGB
                   [ { color = 0xFF3333, stop = 0.0 }
                   , { color = 0xFFB8B8, stop = 0.5 }
@@ -246,6 +251,7 @@ let toConfig =
 
 in  { toConfig
     , Block
+    , Column
     , ModType
     , Layout
     , Panel
diff --git a/config/fallback.dhall b/config/fallback.dhall
index ce9c7e3..308438f 100644
--- a/config/fallback.dhall
+++ b/config/fallback.dhall
@@ -3,19 +3,21 @@ let C = ./config.dhall
 let layout =
         { anchor = { x = 12, y = 11 }
         , panels =
-              [ { columns =
-                  [ { blocks =
-                      [ C.Block.Mod C.ModType.network
-                      , C.Block.Pad 10
-                      , C.Block.Mod C.ModType.memory
-                      , C.Block.Pad 10
-                      , C.Block.Mod C.ModType.processor
-                      ]
-                    , width = 436
-                    }
-                  ]
-                , margins = { x = 20, y = 10 }
-                }
+              [ C.Panel.PPanel
+                  { columns =
+                    [ C.Column.CCol
+                        { blocks =
+                          [ C.Block.Mod C.ModType.network
+                          , C.Block.Pad 10
+                          , C.Block.Mod C.ModType.memory
+                          , C.Block.Pad 10
+                          , C.Block.Mod C.ModType.processor
+                          ]
+                        , width = 436
+                        }
+                    ]
+                  , margins = { x = 20, y = 10 }
+                  }
               ]
             : List C.Panel
         }
diff --git a/conky.conf b/conky.conf
index 6bed01a..9781c55 100644
--- a/conky.conf
+++ b/conky.conf
@@ -73,7 +73,6 @@ local i_o = require 'i_o'
 local config_path = '/tmp/conky.yml'
 
 local try_read_config = function(path)
-   print(path)
    local cmd = string.format('dhall-to-yaml --file %s > %s', path, config_path)
    return i_o.exit_code_cmd(cmd)
 end
diff --git a/src/color.lua b/src/color.lua
index c834493..cbc54ca 100644
--- a/src/color.lua
+++ b/src/color.lua
@@ -15,7 +15,6 @@ local rgba = function(hex, alpha)
          a = alpha,
       }
    )
-   print(hex, obj.r, obj.g, obj.b)
    return err.set_type(obj, "color")
 end