moved waydroid to dev

This commit is contained in:
Sven Vogel 2023-12-15 23:02:33 +01:00
parent 826823ccf4
commit 2c08c0bd11
6 changed files with 26 additions and 25 deletions

View File

@ -28,12 +28,7 @@ in
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment? system.stateVersion = "23.11"; # Did you read the comment?
hardware.bluetooth.enable = true; hardware.opengl.enable = true;
hardware.opengl.enable = true;
# for rotation sensors
hardware.sensor.iio.enable = true;
# screen and keybord backlight
hardware.acpilight.enable = true;
networking.firewall.checkReversePath = false; networking.firewall.checkReversePath = false;
networking.hostName = "servostar-nixos-flex"; # Define your hostname. networking.hostName = "servostar-nixos-flex"; # Define your hostname.
@ -100,22 +95,6 @@ in
# Configure console keymap # Configure console keymap
console.keyMap = "de"; console.keyMap = "de";
################################################
# __ ___ _ _ _ _ _
# \ \ / (_)_ __| |_ _ _ __ _| (_)___ __ _| |_(_) ___ _ __
# \ \ / /| | '__| __| | | |/ _` | | / __|/ _` | __| |/ _ \| '_ \
# \ V / | | | | |_| |_| | (_| | | \__ \ (_| | |_| | (_) | | | |
# \_/ |_|_| \__|\__,_|\__,_|_|_|___/\__,_|\__|_|\___/|_| |_|
#
# This sections enbales host virtualisation for:
# - KVM
# - Waydroid (android based on LineageOS)
# - Docker
################################################
# android container
virtualisation.waydroid.enable = true;
################################################ ################################################
# ____ _ _ # ____ _ _
# | _ \(_)_ __ _____ _(_)_ __ ___ # | _ \(_)_ __ _____ _(_)_ __ ___

View File

@ -9,5 +9,6 @@ in
++ lib.optionals settings.dev.platformio [ ./platformio.nix ] ++ lib.optionals settings.dev.platformio [ ./platformio.nix ]
++ lib.optionals settings.dev.latex [ ./latex.nix ] ++ lib.optionals settings.dev.latex [ ./latex.nix ]
++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ] ++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ]
++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]; ++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]
++ lib.optionals settings.virtualisation.waydroid [ ./waydroid.nix ];
} }

4
dev/waydroid.nix Normal file
View File

@ -0,0 +1,4 @@
{ pkgs, config, ... }: {
# android container
virtualisation.waydroid.enable = true;
}

12
hardware/common.nix Normal file
View File

@ -0,0 +1,12 @@
{ pkgs, lib, ... }:
let
settings = import ./../settings.nix;
in
{
hardware.bluetooth.enable = settings.hardware.bluetooth;
# for rotation sensors
hardware.sensor.iio.enable = settings.hardware.iio;
# screen and keybord backlight
hardware.acpilight.enable = settings.hardware.acpilight;
}

View File

@ -4,8 +4,8 @@ let
in in
{ {
# Optionally import modules for specific hardware # Optionally import modules for specific hardware
imports = imports = [ ./common.nix ]
lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ] ++ lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ]
++ lib.optionals settings.hardware.intelgpu [ ./intelgpu.nix ] ++ lib.optionals settings.hardware.intelgpu [ ./intelgpu.nix ]
++ lib.optionals settings.hardware.nvidiagpu [ ./nvidiagpu.nix ]; ++ lib.optionals settings.hardware.nvidiagpu [ ./nvidiagpu.nix ];
} }

View File

@ -5,6 +5,10 @@ with import <nixpkgs> {}; {
intelgpu = false; intelgpu = false;
nvidiagpu = false; nvidiagpu = false;
bluetooth = true;
acpilight = false;
iio = true;
# support for yubikey and additional software # support for yubikey and additional software
yubikey = { yubikey = {
enable = true; enable = true;
@ -23,6 +27,7 @@ with import <nixpkgs> {}; {
enable = true; enable = true;
virt-manager = true; virt-manager = true;
}; };
waydroid = false;
}; };
dev = { dev = {
platformio = true; platformio = true;