Android: Replace Makefile terminal init with terminal option.

This commit is contained in:
Dmitry Voronin 2024-10-22 05:52:21 +03:00
parent 501d09c746
commit f7357a2fdb
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
3 changed files with 13 additions and 16 deletions

View file

@ -7,8 +7,6 @@ help:
android:
nix-on-droid switch --flake $(flake)
cp ~/.termux/_font.ttf ~/.termux/font.ttf
cp ~/.termux/_colors.properties ~/.termux/colors.properties
cp ~/.Wallpaper /sdcard/Download/Wallpaper.jpg
cp ~/.Wallpaper /sdcard/Download/Wallpaper.png

View file

@ -1,13 +1,9 @@
# This is a common user configuration.
{
const,
pkgs,
self,
config,
lib,
inputs,
pkgsStable,
pkgsMaster,
__findFile,
...
}@args:
@ -27,17 +23,19 @@ in
};
config = mkIf cfg.enable {
time.timeZone = const.timeZone;
environment.packages = package.core;
time.timeZone = const.timeZone;
terminal = {
inherit (android) font colors;
};
home-manager.config = stylix // {
imports = [ inputs.stylix.homeManagerModules.stylix ];
home = {
stateVersion = const.droidStateVersion;
file = import ./config args;
sessionVariables = import ./variable args;
file = (import ./config args) // {
".termux/_font.ttf".source = android.font;
".termux/_colors.properties".text = android.colors;
};
stateVersion = const.droidStateVersion;
};
programs = import ./program args;
};

View file

@ -6,8 +6,9 @@
}/share/fonts/truetype/NerdFonts/TerminessNerdFontMono-Regular.ttf $out
'';
colors = ''
background=#${config.style.color.bg.dark}
foreground=#${config.style.color.fg.light}
'';
colors = with config.style.color; {
background = "#${bg.dark}";
cursor = "#${fg.light}";
foreground = "#${fg.light}";
};
}