misc cleanup

systems/game-laptop/default.nix

@@ -7,7 +7,6 @@ inputs: {
 }: {
   imports = [
     (import ./prime.nix inputs)
-    (import ./gaming.nix inputs)
   ];
 
   disko.devices = import ./disko.nix;
@@ -28,9 +27,12 @@ inputs: {
     "nvidia-persistenced"
     "steam"
     "steam-original"
-    "steam-run"
   ];
   environment.systemPackages = [
+    pkgs.heroic
+    pkgs.legendary-gl
+    pkgs.prismlauncher
+    pkgs.lutris
     pkgs.pcmanfm #file manager
     pkgs.librewolf #best browser
     pkgs.obs-studio

systems/game-laptop/gaming.nix

@@ -1,8 +0,0 @@
-_: {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    heroic
-    legendary-gl
-    prismlauncher
-    lutris
-  ];
-}

systems/game-laptop/prime.nix

@@ -1,8 +1,4 @@
-_: {
-  config,
-  pkgs,
-  ...
-}: {
+_: {config, ...}: {
   hardware.nvidia = {
     package = config.boot.kernelPackages.nvidiaPackages.latest;
     prime = {
@@ -10,7 +6,6 @@ _: {
         enable = true;
         enableOffloadCmd = true;
       };
-      #      sync.enable = true;
       amdgpuBusId = "PCI:5:0:0";
       nvidiaBusId = "PCI:1:0:0";
     };
@@ -23,7 +18,6 @@ _: {
     modesetting.enable = true;
   };
   services.xserver = {
-    videoDrivers = ["nvidia"];
     #disable DPMS
     monitorSection = ''
       Option "DPMS" "false"

systems/gerg-desktop/default.nix

@@ -40,7 +40,11 @@ inputs: {
     videoDrivers = ["nvidia" "amdgpu"];
   };
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.allowedUnfree = [
+    "nvidia-x11"
+    "steam"
+    "steam-original"
+  ];
 
   environment.systemPackages = [
     pkgs.bitwarden #store stuff
@@ -54,6 +58,7 @@ inputs: {
     pkgs.ripgrep
     pkgs.lutris
     pkgs.prismlauncher
+    pkgs.xautoclick
     # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
     (pkgs.symlinkJoin {
       name = "webcord-wrapper";