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

Android: Replace Makefile terminal init with terminal option.

Browse source
This commit is contained in:
Dmitry Voronin 2024-10-22 05:52:21 +03:00
parent 501d09c746
commit fdd1f38a33
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -7,8 +7,6 @@ help:
android: android:
nix-on-droid switch --flake $(flake) 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.jpg
cp ~/.Wallpaper /sdcard/Download/Wallpaper.png cp ~/.Wallpaper /sdcard/Download/Wallpaper.png

14
home/Android.nix
View file

@ -27,17 +27,19 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
time.timeZone = const.timeZone;
environment.packages = package.core; environment.packages = package.core;
time.timeZone = const.timeZone;
terminal = {
inherit (android) font colors;
};
home-manager.config = stylix // { home-manager.config = stylix // {
imports = [ inputs.stylix.homeManagerModules.stylix ]; imports = [ inputs.stylix.homeManagerModules.stylix ];
home = { home = {
stateVersion = const.droidStateVersion; file = import ./config args;
sessionVariables = import ./variable args; sessionVariables = import ./variable args;
file = (import ./config args) // { stateVersion = const.droidStateVersion;
".termux/_font.ttf".source = android.font;
".termux/_colors.properties".text = android.colors;
};
}; };
programs = import ./program args; programs = import ./program args;
}; };

9
home/android/default.nix
View file

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