From fe82c49eb5535cc6054142c76fcce3eb1cca2a06 Mon Sep 17 00:00:00 2001 From: Lilith Date: Mon, 24 Mar 2025 21:21:19 +0100 Subject: [PATCH 1/2] android --- system/core/android-dev.nix | 7 +++++++ system/core/default.nix | 5 ++++- system/core/networking.nix | 5 ++++- system/core/packages.nix | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 system/core/android-dev.nix diff --git a/system/core/android-dev.nix b/system/core/android-dev.nix new file mode 100644 index 00000000..6a2df1b4 --- /dev/null +++ b/system/core/android-dev.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + programs.adb.enable = true; + users.users."lilith".extraGroups = [ "adbusers" ]; + + environment.systemPackages = [ pkgs.android-studio ]; +} diff --git a/system/core/default.nix b/system/core/default.nix index 151cf84f..41b02ac2 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ imports = [ ./audio.nix ./bluetooth.nix @@ -15,5 +16,7 @@ ./syncthing.nix ./users.nix ./zsh.nix + + ./android-dev.nix ]; } diff --git a/system/core/networking.nix b/system/core/networking.nix index 2eb83e61..806616f0 100644 --- a/system/core/networking.nix +++ b/system/core/networking.nix @@ -6,7 +6,10 @@ ethernet.macAddress = "random"; }; - networking.nameservers = [ "192.168.178.111" ]; + networking.nameservers = [ + "192.168.178.1" + "192.168.178.111" + ]; networking.nftables = { enable = true; diff --git a/system/core/packages.nix b/system/core/packages.nix index c0805ad6..b5b4f744 100644 --- a/system/core/packages.nix +++ b/system/core/packages.nix @@ -1,4 +1,5 @@ -{ pkgs, ...}: { +{ pkgs, ... }: +{ environment.systemPackages = with pkgs; [ age compsize From 84359b6254effaec2a051a168feacf33bccce0ed Mon Sep 17 00:00:00 2001 From: Lilith Date: Mon, 31 Mar 2025 13:16:35 +0200 Subject: [PATCH 2/2] merge --- hosts/lilith-pad/default.nix | 3 ++- system/core/default.nix | 6 +++--- unfree.nix | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hosts/lilith-pad/default.nix b/hosts/lilith-pad/default.nix index e5f28216..3b289317 100644 --- a/hosts/lilith-pad/default.nix +++ b/hosts/lilith-pad/default.nix @@ -8,7 +8,8 @@ in desktop.enable = true; home-manager.users."lilith".desktop.touchSupport = true; - gaming.enable = false; + gaming.enable = true; + gaming.client-only = true; nfs.client.enable = true; auto_styling.enable = true; diff --git a/system/core/default.nix b/system/core/default.nix index 41b02ac2..70a3ab04 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { imports = [ ./audio.nix @@ -16,7 +16,7 @@ ./syncthing.nix ./users.nix ./zsh.nix - - ./android-dev.nix ]; + + environment.systemPackages = with pkgs; [ distrobox ]; } diff --git a/unfree.nix b/unfree.nix index 6675cc39..371fd3da 100644 --- a/unfree.nix +++ b/unfree.nix @@ -2,5 +2,7 @@ allowed = [ "steam" "steam-unwrapped" + + "android-studio-stable" ]; }