voronind/nix
0
0
Fork 0
Code Issues 41 Pull requests Packages Projects Releases Wiki Activity

Android : Refactor stylix to use the system module.

Browse source
This commit is contained in:
Dmitry Voronin 2024-06-29 23:34:34 +03:00
parent d564678824
commit bd75d95dad
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
2 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
android/default.nix
View file

@ -16,11 +16,12 @@
termux = import ./Termux.nix args;
# External modules.
bash = import ../module/common/bash args;
nvim = import ../module/common/nvim args;
ssh = import ../module/common/ssh args;
tmux = import ../module/common/tmux args;
yazi = import ../user/common/yazi args;
bash = import ../module/common/bash args;
nvim = import ../module/common/nvim args;
ssh = import ../module/common/ssh args;
stylix = import ../module/common/Stylix.nix args;
tmux = import ../module/common/tmux args;
yazi = import ../user/common/yazi args;
in {
# Configure system.
time.timeZone = const.timeZone;
@ -30,58 +31,56 @@ in {
# Install packages.
environment.packages = package.list;
home-manager.config = {
home-manager.config = stylix // {
imports = [
inputs.stylix.homeManagerModules.stylix
# ../module/common/Stylix.nix
# ../module/common/Wallpaper.nix
];
stylix = {
enable = true;
image = config.module.common.wallpaper.path;
autoEnable = false;
polarity = "dark";
opacity = {
applications = 0.85;
terminal = 0.85;
popups = 0.85;
desktop = 0.85;
};
cursor = {
name = "Adwaita";
package = pkgs.gnome3.adwaita-icon-theme;
size = 14;
};
fonts = let
serif = {
package = (pkgs.callPackage ../module/common/applefont {});
name = "SF Pro Display";
};
in {
inherit serif;
sizes = {
applications = 12;
terminal = 14;
popups = 12;
desktop = 14;
};
sansSerif = serif;
monospace = {
package = (pkgs.nerdfonts.override { fonts = [ "Terminus" ]; });
name = "Terminess Nerd Font Mono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
override = if config.module.common.wallpaper.forceContrastText then {
base04 = "000000";
base05 = "ffffff";
base06 = "ffffff";
} else {};
};
# stylix = {
# enable = true;
# image = config.module.common.wallpaper.path;
# autoEnable = false;
# polarity = "dark";
# opacity = {
# applications = 0.85;
# terminal = 0.85;
# popups = 0.85;
# desktop = 0.85;
# };
# cursor = {
# name = "Adwaita";
# package = pkgs.gnome3.adwaita-icon-theme;
# size = 14;
# };
# fonts = let
# serif = {
# package = (pkgs.callPackage ../module/common/applefont {});
# name = "SF Pro Display";
# };
# in {
# inherit serif;
# sizes = {
# applications = 12;
# terminal = 14;
# popups = 12;
# desktop = 14;
# };
# sansSerif = serif;
# monospace = {
# package = (pkgs.nerdfonts.override { fonts = [ "Terminus" ]; });
# name = "Terminess Nerd Font Mono";
# };
# emoji = {
# package = pkgs.noto-fonts-emoji;
# name = "Noto Color Emoji";
# };
# };
# override = if config.module.common.wallpaper.forceContrastText then {
# base04 = "000000";
# base05 = "ffffff";
# base06 = "ffffff";
# } else {};
# };
home = {
# Release version.

2
module/common/Stylix.nix
View file

@ -1,5 +1,5 @@
{ pkgs, config, ... }: {
config.stylix = {
stylix = {
enable = true;
image = config.module.common.wallpaper.path;
autoEnable = false;