refactor: reorganize Nix configuration and reintroduce Waydroid service
- Update Nix configuration files to improve structure and readability - Reintroduce Waydroid service configuration in common/default.nix - Adjust formatting for consistency across home-manager and host configurations
This commit is contained in:
parent
0fbeaa8f39
commit
65627a3ab5
3 changed files with 20 additions and 18 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs
|
{
|
||||||
, lib
|
pkgs,
|
||||||
, ...
|
lib,
|
||||||
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{ pkgs
|
{
|
||||||
, ...
|
pkgs,
|
||||||
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -41,7 +42,7 @@
|
||||||
LC_TIME = "pt_BR.UTF-8";
|
LC_TIME = "pt_BR.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "Nixstation";
|
hostName = "Nixstation";
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
|
|
@ -142,18 +143,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
waydroid-config = {
|
|
||||||
description = "Configure Waydroid Properties";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
after = [ "waydroid-container.service" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = pkgs.writeShellScript "waydroid-config" ''
|
|
||||||
echo "ro.hardware.gralloc=default" >> /var/lib/waydroid/waydroid_base.prop
|
|
||||||
echo "ro.hardware.egl=swiftshader" >> /var/lib/waydroid/waydroid_base.prop
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
system.stateVersion = "25.11"; # keep it!
|
system.stateVersion = "25.11"; # keep it!
|
||||||
time.timeZone = "America/Sao_Paulo";
|
time.timeZone = "America/Sao_Paulo";
|
||||||
|
|
|
||||||
|
|
@ -82,6 +82,18 @@
|
||||||
pkgs.libwacom
|
pkgs.libwacom
|
||||||
pkgs.nitrokey-udev-rules
|
pkgs.nitrokey-udev-rules
|
||||||
];
|
];
|
||||||
|
waydroid-config = {
|
||||||
|
description = "Configure Waydroid Properties";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "waydroid-container.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = pkgs.writeShellScript "waydroid-config" ''
|
||||||
|
echo "ro.hardware.gralloc=default" >> /var/lib/waydroid/waydroid_base.prop
|
||||||
|
echo "ro.hardware.egl=swiftshader" >> /var/lib/waydroid/waydroid_base.prop
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
users.groups.scard = { };
|
users.groups.scard = { };
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue