Environment : Move everything to the relevant places.

flake.nix

@@ -113,7 +113,6 @@
 			./module/common/Bootloader.nix
 			./module/common/Distrobox.nix
 			./module/common/Dotfiles.nix
-			./module/common/Environment.nix
 			./module/common/Filesystem.nix
 			./module/common/Firefox.nix
 			./module/common/Firewall.nix

module/Desktop.nix

@@ -1,18 +1,4 @@
 { pkgs, ... }: {
-	environment.systemPackages = with pkgs; [
-		adwsteamgtk
-		android-studio
-		blender-hip
-		bottles
-		gimp
-		gradience
-		jellyfin
-		jetbrains.idea-community
-		obs-studio
-		onlyoffice-bin
-		tor-browser
-	];
-
 	hardware.opengl = let
 		packages = with pkgs; [
 			dxvk
@@ -25,6 +11,38 @@
 		extraPackages32 = packages;
 	};
 
+	environment = {
+		systemPackages = with pkgs; [
+			adwsteamgtk
+			android-studio
+			blender-hip
+			bottles
+			dxvk
+			gamescope
+			gimp
+			gradience
+			jellyfin
+			jetbrains.idea-community
+			mangohud
+			obs-studio
+			onlyoffice-bin
+			tor-browser
+			vkd3d
+		];
+
+		variables = {
+			# MangoHud.
+			MANGOHUD = "1";
+			MANGOHUD_CONFIGFILE  = "/etc/mangohud/MangoHud.conf";
+			MANGOHUD_PRESETSFILE = "/etc/mangohud/MangoPresets.conf";
+
+			# Proton.
+			WINEFSYNC = "1";
+		};
+
+		etc.mangohud.source = ./mangohud;
+	};
+
 	# Special packages.
 	programs.steam.enable = true;
 }

module/NixOnDroid.nix

@@ -10,6 +10,8 @@ in {
 		};
 		home.sessionVariables = {
 			BASH_PATH          = "${homePath}/.bash";
+			EDITOR             = "nvim";
+			MANPAGER           = "nvim +Man!";
 			NIX_CURRENT_SYSTEM = "${pkgs.stdenv.system}";
 			TERM               = "xterm-256color";
 		};

module/common/Bash.nix

@@ -1,6 +1,9 @@
 { lib, ... }: {
+	programs.bash.interactiveShellInit = "source /etc/bash/Bashrc.sh";
 	environment.etc.bash.source = ./bash;
 	environment.shellAliases    = lib.mkForce {};
-	environment.variables.BASH_PATH    = "/etc/bash";
-	programs.bash.interactiveShellInit = "source /etc/bash/Bashrc.sh";
+	environment.variables = {
+		BASH_PATH = "/etc/bash";
+		TERM      = "xterm-256color";
+	};
 }

module/common/Environment.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }: {
-	security.loginDefs.settings.UMASK = "077";
-	environment.variables = {
-		# Neovim.
-		EDITOR   = "nvim";
-		MANPAGER = "nvim +Man!";
-
-		# Mangohud.
-		MANGOHUD = "1";
-		MANGOHUD_CONFIG = "no_display=0,hud_no_margin=1,font_size=12,toggle_hud=F1,fps_sampling_period=1000,fps_limit=165,fps_limit_method=early,af=16,vsync=3,gl_vsync=1,throttling_status=1,cpu_temp=1,gpu_temp=1,gpu_junction_temp=1,device_battery=gamepad,mouse,frame_timing=0,benchmark_percentiles=0,battery=1,battery_time=1,time=1,ram=1,vram=1,swap=1";
-
-		# Proton.
-		WINEFSYNC = "1";
-
-		# Nix.
-		NIX_CURRENT_SYSTEM = "${pkgs.stdenv.system}";
-
-		# Shell.
-		TERM = "xterm-256color";
-	};
-}

module/common/Nix.nix

@@ -1,15 +1,18 @@
-{ ... }: {
-	environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
+{ pkgs, ... }: {
+	environment.variables = {
+		NIXPKGS_ALLOW_UNFREE = "1";
+		NIX_CURRENT_SYSTEM   = "${pkgs.stdenv.system}";
+	};
 	nixpkgs.config.allowUnfree       = true;
 	nix.settings.auto-optimise-store = true;
 	nix.extraOptions = ''
 		experimental-features = nix-command flakes
 		keep-derivations = true
 		keep-outputs = true
-		min-free = ${toString (50 * 1024 * 1024 * 1024)}
+		min-free = ${toString(50 * 1000 * 1000 * 1000)}
 	'';
 
-	# max-free = ${toString (10 * 1024 * 1024 * 1024)}
+	# max-free = ${toString(10 * 1024 * 1024 * 1024)}
 	# nix.gc = {
 	# 	automatic  = true;
 	# 	dates      = "weekly";

module/common/Nvim.nix

@@ -8,7 +8,13 @@
 		) "" cfgs;
 	in runtimeRc + cfgRc;
 in {
-	environment.etc.nvim.source = ./nvim;
+	environment = {
+		etc.nvim.source = ./nvim;
+		variables = {
+			EDITOR   = "nvim";
+			MANPAGER = "nvim +Man!";
+		};
+	};
 	programs.neovim = {
 		enable   = true;
 		viAlias  = true;

module/common/Package.nix

@@ -25,7 +25,6 @@
 		lshw
 		lsof
 		ltex-ls
-		mangohud
 		mpv
 		neofetch
 		networkmanager_strongswan

module/common/Users.nix

@@ -1,3 +1,4 @@
 { ... }: {
+	security.loginDefs.settings.UMASK = "077";
 	users.mutableUsers = false;
 }

module/mangohud/MangoHud.conf

@@ -0,0 +1,25 @@
+af=16
+alpha=
+battery=1
+battery_time=1
+benchmark_percentiles=0
+cpu_temp=1
+device_battery=gamepad
+font_size=12
+fps_limit=165
+fps_limit_method=early
+fps_sampling_period=1000
+frame_timing=0
+gl_vsync=1
+gpu_junction_temp=1
+gpu_temp=1
+hud_no_margin=1
+mouse
+no_display=0
+ram=1
+swap=1
+throttling_status=1
+time=1
+toggle_hud=F1
+vram=1
+vsync=3