mirror of
https://github.com/donovanglover/nix-config.git
synced 2025-02-16 17:50:52 +01:00
meta: Merge stylix module with desktop
This continues the process of simplifying the available modules for end-users. The final result would be having a clear set of modules like "desktop" and "shell" that can be enabled if users want a complete Hyprland environment or a complete shell environment. Enabling the stylix module "only" would be a low-tech solution and at that point it'd likely be better for end-users to take complete control of their stylix config with their own module.
This commit is contained in:
parent
dab608bb6c
commit
cd5f0793d7
@ -5,6 +5,10 @@ let
|
||||
inherit (pkgs.xfce) thunar-volman exo;
|
||||
inherit (pkgs) glib;
|
||||
|
||||
theme = "monokai";
|
||||
opacity = 0.95;
|
||||
font-size = 11;
|
||||
|
||||
cfg = config.modules.desktop;
|
||||
in
|
||||
{
|
||||
@ -122,5 +126,50 @@ in
|
||||
allowBitmaps = false;
|
||||
};
|
||||
};
|
||||
stylix = {
|
||||
image = ../assets/wallpaper.png;
|
||||
polarity = "dark";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml";
|
||||
|
||||
opacity = {
|
||||
terminal = opacity;
|
||||
popups = opacity;
|
||||
};
|
||||
|
||||
cursor = with pkgs; {
|
||||
package = phinger-cursors;
|
||||
name = "phinger-cursors";
|
||||
size = 24;
|
||||
};
|
||||
|
||||
fonts = with pkgs; {
|
||||
serif = {
|
||||
package = (callPackage ../packages/aleo-fonts.nix { });
|
||||
name = "Aleo";
|
||||
};
|
||||
|
||||
sansSerif = {
|
||||
package = noto-fonts-cjk-sans;
|
||||
name = "Noto Sans CJK JP";
|
||||
};
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,54 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
theme = "monokai";
|
||||
opacity = 0.95;
|
||||
font-size = 11;
|
||||
in
|
||||
{
|
||||
stylix = {
|
||||
image = ../assets/wallpaper.png;
|
||||
polarity = "dark";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml";
|
||||
|
||||
opacity = {
|
||||
terminal = opacity;
|
||||
popups = opacity;
|
||||
};
|
||||
|
||||
cursor = with pkgs; {
|
||||
package = phinger-cursors;
|
||||
name = "phinger-cursors";
|
||||
size = 24;
|
||||
};
|
||||
|
||||
fonts = with pkgs; {
|
||||
serif = {
|
||||
package = (callPackage ../packages/aleo-fonts.nix { });
|
||||
name = "Aleo";
|
||||
};
|
||||
|
||||
sansSerif = {
|
||||
package = noto-fonts-cjk-sans;
|
||||
name = "Noto Sans CJK JP";
|
||||
};
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user