FIX typos

This commit is contained in:
Nathan Dwarshuis 2022-08-11 00:27:16 -04:00
parent 0c4172b149
commit ee09e31e7d
4 changed files with 27 additions and 21 deletions

View File

@ -58,21 +58,26 @@ let Modules =
} }
let ModType = let ModType =
< fileSystem < filesystem
| graphics | graphics
| memory | memory
| network | network
| pacman | pacman
| processor | processor
| power
| readwrite | readwrite
| system | system
> >
let Block = < Pad : Natural | Mod : ModType > 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 } let Layout = { anchor : Point, panels : List Panel }
@ -113,7 +118,7 @@ let TableGeometry =
{ name_chars = 8 { name_chars = 8
, padding = { x = 6, y = 15 } , padding = { x = 6, y = 15 }
, header_padding = 20 , header_padding = 20
, row_spacing = 13 , row_spacing = 16
} }
} }
@ -160,7 +165,7 @@ let Patterns =
, data : { border : Pattern, fill : Pattern } , data : { border : Pattern, fill : Pattern }
} }
, indicator : , indicator :
{ bg : Pattern, fg : { active : Pattern, inactive : Pattern } } { bg : Pattern, fg : { active : Pattern, critical : Pattern } }
} }
, default = , default =
{ header = Pattern.RGB 0xefefef { header = Pattern.RGB 0xefefef
@ -201,7 +206,7 @@ let Patterns =
, { color = 0x99CEFF, stop = 0.5 } , { color = 0x99CEFF, stop = 0.5 }
, { color = 0x316BA6, stop = 1.0 } , { color = 0x316BA6, stop = 1.0 }
] ]
, inactive = , critical =
Pattern.GradientRGB Pattern.GradientRGB
[ { color = 0xFF3333, stop = 0.0 } [ { color = 0xFF3333, stop = 0.0 }
, { color = 0xFFB8B8, stop = 0.5 } , { color = 0xFFB8B8, stop = 0.5 }
@ -246,6 +251,7 @@ let toConfig =
in { toConfig in { toConfig
, Block , Block
, Column
, ModType , ModType
, Layout , Layout
, Panel , Panel

View File

@ -3,19 +3,21 @@ let C = ./config.dhall
let layout = let layout =
{ anchor = { x = 12, y = 11 } { anchor = { x = 12, y = 11 }
, panels = , panels =
[ { columns = [ C.Panel.PPanel
[ { blocks = { columns =
[ C.Block.Mod C.ModType.network [ C.Column.CCol
, C.Block.Pad 10 { blocks =
, C.Block.Mod C.ModType.memory [ C.Block.Mod C.ModType.network
, C.Block.Pad 10 , C.Block.Pad 10
, C.Block.Mod C.ModType.processor , C.Block.Mod C.ModType.memory
] , C.Block.Pad 10
, width = 436 , C.Block.Mod C.ModType.processor
} ]
] , width = 436
, margins = { x = 20, y = 10 } }
} ]
, margins = { x = 20, y = 10 }
}
] ]
: List C.Panel : List C.Panel
} }

View File

@ -73,7 +73,6 @@ local i_o = require 'i_o'
local config_path = '/tmp/conky.yml' local config_path = '/tmp/conky.yml'
local try_read_config = function(path) local try_read_config = function(path)
print(path)
local cmd = string.format('dhall-to-yaml --file %s > %s', path, config_path) local cmd = string.format('dhall-to-yaml --file %s > %s', path, config_path)
return i_o.exit_code_cmd(cmd) return i_o.exit_code_cmd(cmd)
end end

View File

@ -15,7 +15,6 @@ local rgba = function(hex, alpha)
a = alpha, a = alpha,
} }
) )
print(hex, obj.r, obj.g, obj.b)
return err.set_type(obj, "color") return err.set_type(obj, "color")
end end