From 12464e8b65664795d2d8e8de66f15f4278a8e4c1 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 1 Apr 2024 05:50:42 -0400 Subject: [PATCH] chore: Improve formatting No need to write stylix so many times. --- modules/stylix.nix | 70 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/modules/stylix.nix b/modules/stylix.nix index f07cc119..d3ec7f28 100644 --- a/modules/stylix.nix +++ b/modules/stylix.nix @@ -6,47 +6,49 @@ let font-size = 11; in { - stylix.image = ../assets/wallpaper.png; - stylix.polarity = "dark"; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; + stylix = { + image = ../assets/wallpaper.png; + polarity = "dark"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; - stylix.opacity = { - terminal = opacity; - popups = opacity; - }; - - stylix.cursor = with pkgs; { - package = phinger-cursors; - name = "phinger-cursors"; - size = 24; - }; - - stylix.fonts = with pkgs; { - serif = { - package = (callPackage ../packages/aleo-fonts.nix { }); - name = "Aleo"; + opacity = { + terminal = opacity; + popups = opacity; }; - sansSerif = { - package = noto-fonts-cjk-sans; - name = "Noto Sans CJK JP"; + cursor = with pkgs; { + package = phinger-cursors; + name = "phinger-cursors"; + size = 24; }; - monospace = { - package = maple-mono; - name = "Maple Mono"; - }; + fonts = with pkgs; { + serif = { + package = (callPackage ../packages/aleo-fonts.nix { }); + name = "Aleo"; + }; - emoji = { - package = noto-fonts-emoji; - name = "Noto Color Emoji"; - }; + sansSerif = { + package = noto-fonts-cjk-sans; + name = "Noto Sans CJK JP"; + }; - sizes = { - applications = font-size; - desktop = font-size; - popups = font-size; - terminal = font-size; + monospace = { + package = maple-mono; + name = "Maple Mono"; + }; + + emoji = { + package = noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + + sizes = { + applications = font-size; + desktop = font-size; + popups = font-size; + terminal = font-size; + }; }; }; }