3 files changed, 13 insertions, 10 deletions
diff --git a/modules/desktop/eww/default.nix b/modules/desktop/eww/default.nix
index be6236f..a0727cd 100644
--- a/modules/desktop/eww/default.nix
+++ b/modules/desktop/eww/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.desktop.eww;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -46,10 +47,10 @@ in
               [
                 config.fonts.normal
                 (toString config.fonts.size)
-                (toString config.fonts.iconSize)
-                (toString config.fonts.labelSize)
-                (toString config.fonts.smallSize)
-                (toString config.fonts.idxSize)
+                (toString config.fonts.icon-size)
+                (toString config.fonts.label-size)
+                (toString config.fonts.small-size)
+                (toString config.fonts.idx-size)
               ]
               (builtins.readFile ./eww.scss);
         in
@@ -67,9 +68,9 @@ in
       Service = {
         Type = "oneshot";
         RemainAfterExit = true;
-        ExecStart = "${lib.getExe config.desktop.eww.package} open bar";
-        ExecReload = "${lib.getExe config.desktop.eww.package} reload && ${lib.getExe config.desktop.eww.package} open bar";
-        ExecStop = "${lib.getExe config.desktop.eww.package} kill";
+        ExecStart = "${lib.getExe cfg.package} open bar";
+        ExecReload = "${lib.getExe cfg.package} reload && ${lib.getExe cfg.package} open bar";
+        ExecStop = "${lib.getExe cfg.package} kill";
         Restart = "on-failure";
       };
       Install.WantedBy = [ "graphical-session.target" ];
diff --git a/modules/desktop/rofi/default.nix b/modules/desktop/rofi/default.nix
index a15ce0a..ed1cf05 100644
--- a/modules/desktop/rofi/default.nix
+++ b/modules/desktop/rofi/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 let
+  cfg = config.desktop.rofi;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
@@ -31,7 +32,7 @@ in
               ]
               [
                 ''"${config.fonts.normal} Bold ${toString config.fonts.size}"''
-                ''"${config.fonts.normal} Bold ${toString config.fonts.idxSize}"''
+                ''"${config.fonts.normal} Bold ${toString config.fonts.idx-size}"''
               ]
               (builtins.readFile ./theme.rasi);
         in
diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix
index 7f46d37..72b0290 100644
--- a/modules/desktop/xdg/default.nix
+++ b/modules/desktop/xdg/default.nix
@@ -6,10 +6,11 @@
   ...
 }:
 let
+  cfg = config.desktop;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
-  config = lib.mkIf config.desktop.enable {
+  config = lib.mkIf cfg.enable {
     dconf.enable = true;
 
     xdg.portal = {
@@ -37,7 +38,7 @@ in
         enable = true;
         font = {
           name = config.fonts.normal;
-          size = config.fonts.uiSize;
+          size = config.fonts.ui-size;
         };
         theme = {
           name = "Adwaita-dark";