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

2
module/common/Stylix.nix
View file

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