diff options
| -rw-r--r-- | config/AppearanceConfig.qml | 1 | ||||
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/dashboard/dash/DateTime.qml | 5 | ||||
| -rw-r--r-- | modules/lock/Center.qml | 4 | ||||
| -rw-r--r-- | modules/lock/Media.qml | 1 |
6 files changed, 13 insertions, 2 deletions
diff --git a/config/AppearanceConfig.qml b/config/AppearanceConfig.qml index 9b3688a..b25945b 100644 --- a/config/AppearanceConfig.qml +++ b/config/AppearanceConfig.qml @@ -38,6 +38,7 @@ JsonObject { property string sans: "Rubik" property string mono: "CaskaydiaCove NF" property string material: "Material Symbols Rounded" + property string clock: "Rubik" } component FontSize: JsonObject { diff --git a/default.nix b/default.nix index a9ebcc1..4d520aa 100644 --- a/default.nix +++ b/default.nix @@ -55,7 +55,7 @@ ++ lib.optional withCli caelestia-cli; fontconfig = makeFontsConf { - fontDirectories = [material-symbols nerd-fonts.caskaydia-cove]; + fontDirectories = [material-symbols rubik nerd-fonts.caskaydia-cove]; }; in stdenv.mkDerivation { @@ -47,7 +47,7 @@ in pkgs.mkShellNoCC { inputsFrom = [shell]; - packages = with pkgs; [material-symbols nerd-fonts.caskaydia-cove]; + packages = with pkgs; [material-symbols rubik nerd-fonts.caskaydia-cove]; CAELESTIA_BD_PATH = "${shell}/bin/beat_detector"; }; }); diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml index cdba4db..b9383f6 100644 --- a/modules/dashboard/dash/DateTime.qml +++ b/modules/dashboard/dash/DateTime.qml @@ -27,6 +27,7 @@ Item { text: root.timeComponents[0] color: Colours.palette.m3secondary font.pointSize: Appearance.font.size.extraLarge + font.family: Appearance.font.family.clock font.weight: 600 } @@ -36,6 +37,7 @@ Item { text: "•••" color: Colours.palette.m3primary font.pointSize: Appearance.font.size.extraLarge * 0.9 + font.family: Appearance.font.family.clock } StyledText { @@ -44,6 +46,7 @@ Item { text: root.timeComponents[1] color: Colours.palette.m3secondary font.pointSize: Appearance.font.size.extraLarge + font.family: Appearance.font.family.clock font.weight: 600 } @@ -58,6 +61,7 @@ Item { text: root.timeComponents[2] ?? "" color: Colours.palette.m3secondary font.pointSize: Appearance.font.size.large + font.family: Appearance.font.family.clock font.weight: 600 } } @@ -69,6 +73,7 @@ Item { text: Time.format("ddd, d") color: Colours.palette.m3tertiary font.pointSize: Appearance.font.size.normal + font.family: Appearance.font.family.clock font.weight: 500 elide: Text.ElideRight } diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index fecd4aa..574894b 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -30,6 +30,7 @@ ColumnLayout { text: root.timeComponents[0] color: Colours.palette.m3secondary font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) + font.family: Appearance.font.family.clock font.bold: true } @@ -38,6 +39,7 @@ ColumnLayout { text: ":" color: Colours.palette.m3primary font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) + font.family: Appearance.font.family.clock font.bold: true } @@ -46,6 +48,7 @@ ColumnLayout { text: root.timeComponents[1] color: Colours.palette.m3secondary font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale) + font.family: Appearance.font.family.clock font.bold: true } @@ -61,6 +64,7 @@ ColumnLayout { text: root.timeComponents[2] ?? "" color: Colours.palette.m3primary font.pointSize: Math.floor(Appearance.font.size.extraLarge * 2 * root.centerScale) + font.family: Appearance.font.family.clock font.bold: true } } diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml index 0f0f3f4..be289eb 100644 --- a/modules/lock/Media.qml +++ b/modules/lock/Media.qml @@ -91,6 +91,7 @@ Item { color: Colours.palette.m3primary horizontalAlignment: Text.AlignHCenter font.pointSize: Appearance.font.size.large + font.family: Appearance.font.family.mono font.weight: 600 elide: Text.ElideRight } |