diff --git a/flake.nix b/flake.nix index 6280798..b220e58 100644 --- a/flake.nix +++ b/flake.nix @@ -169,6 +169,9 @@ tablet = nix-on-droid.lib.nixOnDroidConfiguration { config = ./machines/tablet/configuration.nix; system = "aarch64-linux"; + extraModules = [ + ./modules/nix-on-droid/default.nix + ]; }; }; packages = { diff --git a/machines/tablet/configuration.nix b/machines/tablet/configuration.nix index 865d469..88d8a3b 100644 --- a/machines/tablet/configuration.nix +++ b/machines/tablet/configuration.nix @@ -1,5 +1,3 @@ { config, lib, pkgs, ... }: -{ - -} +{ } diff --git a/modules/nix-on-droid/default.nix b/modules/nix-on-droid/default.nix index 17acfb2..fb279fd 100644 --- a/modules/nix-on-droid/default.nix +++ b/modules/nix-on-droid/default.nix @@ -2,4 +2,10 @@ let inherit (import ../lib.nix { inherit lib; inherit pkgs; }) nLib; in -{ } +{ + imports = [ + ../options.nix + ]; + + options = with lib; with nLib; { }; +} diff --git a/modules/nix-on-droid/programs/util.nix b/modules/nix-on-droid/programs/util.nix new file mode 100644 index 0000000..1e29556 --- /dev/null +++ b/modules/nix-on-droid/programs/util.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: +let + nathan = config.nathan; +in +with lib; +{ + config = mkMerge [ + (mkIf nathan.programs.utils.core + { + environment.packages = with pkgs; [ + # Basic command line utilities + wget + tmux + nano + unzip + any-nix-shell + htop + # For being able to update the flake + gitFull + # For nslookup + dnsutils + # Mosh for better high-latency ssh + mosh + # PV for viewing pipes + pv + ]; + }) + (mkIf nathan.programs.utils.devel { + environment.packages = with pkgs; [ + gcc + binutils + ]; + }) + ]; +}