module/NixOnDroid.nix

@@ -1,46 +1,6 @@
 { pkgs, inputs, const, ... }: let
 	homePath = "/data/data/com.termux.nix/files/home";
 in {
-	# NOTE: Split into modules?
-	environment.packages = with pkgs; [
-		android-tools
-		binwalk
-		coreutils
-		curl
-		diffutils
-		ffmpeg
-		file
-		findutils
-		gawk
-		gcc
-		gdu
-		git
-		gnugrep
-		gnumake
-		gnused
-		gnutar
-		gzip
-		hostname
-		imagemagick
-		jq
-		lsof
-		man
-		neofetch
-		nmap
-		openssh
-		parallel
-		pv
-		rsync
-		sqlite
-		tmux
-		tree
-		utillinux
-		wget
-		xz
-		yt-dlp
-		zip unzip
-	];
-
 	home-manager.config = {
 		home.stateVersion = const.droidStateVersion;
 		home.file = {
@@ -79,4 +39,42 @@ in {
 			extraConfig = (import ./common/nvim/Init.nix { inputs = inputs; }).customRc;
 		};
 	};
+
+	environment.packages = with pkgs; [
+		android-tools
+		binwalk
+		coreutils
+		curl
+		diffutils
+		ffmpeg
+		file
+		findutils
+		gawk
+		gdu
+		git
+		gnugrep
+		gnumake
+		gnused
+		gnutar
+		gzip
+		hostname
+		imagemagick
+		jq
+		lsof
+		man
+		neofetch
+		nmap
+		openssh
+		parallel
+		pv
+		rsync
+		sqlite
+		tmux
+		tree
+		utillinux
+		wget
+		xz
+		yt-dlp
+		zip unzip
+	];
 }

module/common/Nvim.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }: let
+{ inputs, ... }: let
 	nvimCfg = import ./nvim/Init.nix { inputs = inputs; };
 in {
 	environment = {
@@ -6,9 +6,6 @@ in {
 			EDITOR   = "nvim";
 			MANPAGER = "nvim +Man!";
 		};
-		systemPackages = with pkgs; [
-			gcc
-		];
 	};
 	programs.neovim = {
 		enable   = true;