~

Signed-off-by: roxwize <rae@roxwize.xyz>

nixos/home/mozilla.nix

@@ -62,6 +62,8 @@
 					"browser.tabs.closeWindowWithLastTab" = false;
 					"browser.tabs.insertAfterCurrent" = true;
 					"datareporting.healthreport.uploadEnabled" = false;
+					"extensions.pocket.enabled" = false;
+					"extensions.pocket.showHome" = false;
 					"extensions.webextensions.restrictedDomains" = "";
 					"font.name.monospace.x-western" = "Fira Code";
 					"general.autoScroll" = true;

nixos/hosts/base.nix

@@ -11,7 +11,10 @@
 		];
 	};
 	nixpkgs = {
-		config.allowUnfree = true;
+		config = {
+			allowUnfree = true;
+			nvidia.acceptLicense = true;
+		};
 		overlays = import ../overlays.nix inputs;
 	};
 

nixos/hosts/ioides/configuration.nix

@@ -1,4 +1,4 @@
-{ inputs, config, lib, pkgs, ... }: {
+{ inputs, config, pkgs, ... }: {
 	imports = [
 		inputs.nix-flatpak.nixosModules.nix-flatpak
 		./hardware-configuration.nix
@@ -27,21 +27,21 @@
 		supportedFilesystems = [ "ntfs" ];
 	};
 
-	# Music pendrive
+#	# Music pendrive
-	fileSystems."/mnt/world" = {
+#	fileSystems."/mnt/world" = {
-		device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c";
+#		device = "/dev/disk/by-uuid/639bae80-0f5d-481c-ae4e-d2c70f754a1c";
-		fsType = "ext4";
+#		fsType = "ext4";
-		neededForBoot = false;
+#		neededForBoot = false;
-	};
+#	};
-	# Big fucking thing
+#	# Big fucking thing
-	fileSystems."/mnt/rae2" = {
+#	fileSystems."/mnt/rae2" = {
-		device = "/dev/disk/by-uuid/fbbcc72f-34af-425c-9151-ef8919a6ae07";
+#		device = "/dev/disk/by-uuid/fbbcc72f-34af-425c-9151-ef8919a6ae07";
-		fsType = "ext4";
+#		fsType = "ext4";
-		neededForBoot = false;
+#		neededForBoot = false;
-	};
+#	};
 
 	networking = {
-		firewall.allowedTCPPorts = [ 80 443 8080 ];
+		firewall.allowedTCPPorts = [ 80 443 8080 19132 25565 ];
 		hosts = {
 			"10.0.0.2" = [ "near" "near.local" ];
 		};
@@ -53,22 +53,24 @@
 			enable = true;
 			powerOnBoot = true;
 		};
-		graphics = {
+#		graphics = {
-			enable = true;
+#			enable = true;
-			extraPackages = with pkgs; [
+#			extraPackages = with pkgs; [
-				intel-media-sdk
+#				intel-media-sdk
-			];
+#			];
-		};
+#		};
-		nvidia = {
+#		nvidia = {
-			modesetting.enable = true;
+#			modesetting.enable = true;
-			powerManagement = {
+#			powerManagement = {
-				enable = false;
+#				enable = false;
-				finegrained = false;
+#				finegrained = false;
-			};
+#			};
-			open = false;
+#			open = false;
-			nvidiaSettings = true;
+#			nvidiaSettings = true;
-			package = config.boot.kernelPackages.nvidiaPackages.stable;
+#			package = config.boot.kernelPackages.nvidiaPackages.stable;
-		};
+#			# temp
+#			package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
+#		};
 		opentabletdriver.enable = true;
 	};
 	
@@ -119,7 +121,7 @@
 			enable = true;
 			xkb.layout = "us";
 			#?TODO maybe put all nvidia settings into its own module (i.e. r5e.hardware.nvidia.enable) + x11 with xdg config
-			videoDrivers = [ "nvidia" ];
+#			videoDrivers = [ "nvidia" ];
 			windowManager = {
 				cwm.enable = true;
 				openbox.enable = true;

nixos/hosts/marquet/configuration.nix

@@ -0,0 +1,30 @@
+{ pkgs, ... }: {
+	imports = [
+		./hardware-configuration.nix
+		../base.nix
+		../../modules/system
+	];
+
+	r5e.system = {
+		graphics = {
+			display.x11 = {
+				enable = true;
+				windowManagers = {
+					twm.enable = true;
+				};
+				displayManager.autologin = {
+					enable = false;
+					session = "none+twm";
+				};
+			};
+			hardwareAcceleration = {
+				enable = true;
+				intel.videoPlayback = {
+					enable = true;
+					package = pkgs.intel-vaapi-driver;
+				};
+			};
+		};
+	};
+}
+

nixos/modules/system/default.nix

@@ -0,0 +1,118 @@
+{ pkgs, lib, config, ... }: let
+	cfg = config.r5e.system;
+in with lib; {
+	options.r5e.system = {
+		graphics = {
+			display.x11 = {
+				enable = mkEnableOption "X11";
+				windowManagers = {
+					twm.enable = mkEnableOption "twm";
+				};
+				displayManager = {
+					# enable = mkEnableOption "SDDM";
+					autologin = {
+						enable = mkEnableOption "SDDM autologin";
+						user = mkOption {
+							type = types.str;
+							default = "rae";
+						};
+						session = mkOption {
+							type = types.str;
+							default = "none+twm";
+						};
+					};
+				};
+			};
+
+			hardwareAcceleration = {
+				enable = mkEnableOption "graphics acceleration";
+				intel = {
+					videoPlayback = {
+						# TODO wiki.nixos.org/wiki/Intel_Graphics
+						enable = mkEnableOption "accelerated video playback";
+						package = mkPackageOption pkgs "intel-media-driver";
+					};
+					qsv = {
+						enable = mkEnableOption "Intel Quick Sync Video";
+						package = mkPackageOption pkgs "vpl-gpu-rt";
+					};
+				};
+				nvidia = {
+					enable = mkEnableOption "NVIDIA drivers";
+					package = mkPackageOption config.boot.kernelPackages.nvidiaPackages "stable";
+				};
+			};
+		};
+
+		programs = {
+			steam = {
+				enable = mkEnableOption "Steam";
+				openFirewall = mkOption {
+					type = types.bool;
+					default = false;
+				};
+			};
+			thunderbird = {
+				enable = mkEnableOption "Mozilla Thunderbird";
+			};
+		};
+	};
+
+	config = {
+		environment = {
+			sessionVariables = {
+				LIBVA_DRIVER_NAME = mkIf cfg.graphics.hardwareAcceleration.intel.videoPlayback.enable
+					(if cfg.graphics.hardwareAcceleration.intel.videoPlayback.package == pkgs.intel-vaapi-driver then "i965" else "iHD");
+			};
+		};
+
+		hardware = {
+			graphics = {
+				enable = cfg.graphics.hardwareAcceleration.enable;
+				extraPackages =
+					optional cfg.graphics.hardwareAcceleration.intel.videoPlayback.enable cfg.graphics.hardwareAcceleration.intel.videoPlayback.package
+					++ optional cfg.graphics.hardwareAcceleration.intel.qsv.enable cfg.graphics.hardwareAcceleration.intel.qsv.package;
+			};
+			nvidia = mkIf cfg.graphics.hardwareAcceleration.nvidia.enable {
+				modesetting.enable = true;
+				powerManagement = {
+					enable = false;
+					finegrained = false;
+				};
+				open = false;
+				nvidiaSettings = true;
+				package = cfg.graphics.hardwareAcceleration.nvidia.package;
+			};
+		};
+
+		services = {
+			xserver = {
+				enable = cfg.graphics.display.x11.enable;
+				xkb.layout = "us";
+				windowManager = cfg.graphics.display.x11.windowManagers;
+				videoDrivers = optional cfg.graphics.hardwareAcceleration.nvidia.enable "nvidia";
+			};
+			displayManager.sddm = {
+				enable = cfg.graphics.display.x11.enable;
+				settings.Autologin = mkIf cfg.graphics.display.x11.displayManager.autologin.enable {
+					User = cfg.graphics.display.x11.displayManager.autologin.user;
+					Session = cfg.graphics.display.x11.displayManager.autologin.session;
+				};
+			};
+		};
+
+		programs = {
+			steam = {
+				enable = cfg.programs.steam.enable;
+				remotePlay.openFirewall = cfg.programs.steam.openFirewall;
+				dedicatedServer.openFirewall = cfg.programs.steam.openFirewall;
+				localNetworkGameTransfers.openFirewall = cfg.programs.steam.openFirewall;
+			};
+			thunderbird = {
+				enable = cfg.programs.thunderbird.enable;
+				policies.DisableTelemetry = true;
+			};
+		};
+	};
+}
+

secrets/minecraft_wiki.gpg

@@ -0,0 +1,2 @@
+„^>©=€Ě˘

@Çě
+Ž6§]5¦Eů¸JčÁ<C48D>ş;%ŁR˙äg\đ:ŢD0ŚC”3łyP®Ć2ga¤˝˘¤čL	¦_˙O0­Sç»ęĎ‚JĘ)ć4{ÄbÂ
ÔU
	˙Żš¶Jb¦ýĽj1ţŃĽYČ’Ŕůć<7F>Öi
‡Çëkň'—'‹G™=dn˙ŐÂŃŁAŞ<41>7C2.a ČĐÚ5ĺ…:B¬…1ćC€ĹQw{ćy

secrets/openstreetmap.gpg

@@ -0,0 +1 @@
+„^>©=€Ì¢

@2Â`îkõ,~è¦ÔÓ·¥Í<>MMìÝ–;Öìá’·0<>¤ÍOP)ÇvÐÖ%<25>ª<>/M/ê…¦yÔ½á¾Û	hMLUK%ö#ÔU
	*’ÊK-õ`üjÃ}­æÊâ“<C3A2>Ë€7 ¨
~DòË{£ÊÅó¾Âõ<02>«õŸ
"‡ùŠ"õ E²î†ð&ó„s·Øñ=Ùêk&^<5E>