modules/home/stream-tools/default.nix

@@ -11,17 +11,10 @@ in {
     enable = mkEnableOption "Enable the Stream Machine Tools";
   };
 
-  
-
   config = mkIf cfg.enable {
-    programs.obs-studio = {
-      enable = true;
-      plugins = [ pkgs.obs-studio-plugins.droidcam-obs ];
-    };
     home = {
       packages = with pkgs; [
-        # obs-studio
+        obs-studio
-        droidcam
       ];
     };
   };

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -34,7 +34,6 @@ in
   imports = [
     ./configuration.nix
     ./steam.nix
-    ./video.nix
   ];
   config = {
       system.stateVersion = "24.05";
@@ -53,8 +52,6 @@ in
           appimage-run
           inputs.game-of-life.packages.x86_64-linux.default
           inputs.nixos-cosmic
-          minecraft
-          trilium-desktop
           #  thunderbird
         ];
       };
@@ -74,7 +71,7 @@ in
 
       # Install firefox.
       programs.firefox.enable = true;
-      nixpkgs.config.allowBroken = true;
+
       # Set up system Packages
       environment.systemPackages = with pkgs; [
         git
@@ -87,15 +84,13 @@ in
         pkgs.my-namespace.hello
 
         pkgs.nvtopPackages.nvidia
-
+        pkgs.mesa
-        # stuff I installed to try to get gamescope to work to no avail Gamescope is just broken it seems.
+        pkgs.vulkan-loader
-          # pkgs.mesa
+        pkgs.vulkan-validation-layers
-          # pkgs.vulkan-loader
+        pkgs.vulkan-extension-layer
-          # pkgs.vulkan-validation-layers
+        pkgs.vulkan-tools
-          # pkgs.vulkan-extension-layer
+        pkgs.libva
-          # pkgs.vulkan-tools
+        pkgs.libva-utils
-          # pkgs.libva
-          # pkgs.libva-utils
         #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
         #  wget
       ]

systems/x86_64-linux/drivebystation-nix/hardware-configuration.nix

@@ -11,13 +11,9 @@
       ./acer-monitor-edid.nix
     ];
   #boot.kernelPackages = pkgs.linuxPackages_latest;
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
-  boot.kernelPackages = pkgs.linuxPackages;
-  
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.kernelModules = [ "kvm-amd" "4vl2loopback" ];
+  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
-
   boot.blacklistedKernelModules = [ ];
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76";

systems/x86_64-linux/drivebystation-nix/nvidia.nix

@@ -10,35 +10,26 @@
   # Load nvidia driver for Xorg and Wayland
   # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
   # boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_production ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11_beta ];
 
 
-  boot.loader.systemd-boot.consoleMode = "max";
-
   boot.kernelParams = [
    "nvidia-drm.fbdev=1"
    "nvidia-drm.modeset=1"
-   "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
-   "nomodeset"
   #  "nvidia_drm.modeset=1"
   ];
   boot.blacklistedKernelModules = [ 
     "i915" 
     "amdgpu"
-    "nouveau"    
+    "nouveau"   
   ];
-  boot.extraModprobeConfig = ''
-    blacklist nouveau
-    options nouveau modeset=0
-  '';
   services.xserver.videoDrivers = [ "nvidia" ];
   boot.initrd.kernelModules = [ 
     "nvidia" 
     "nvidia-drm"
-    # "nvidiafb"
+    "nvidia-modeset"
-    # "nvidia-modeset"
+    "nvidia-uvm"
-    # "nvidia-uvm"
+    "i2c-nvidia_gpu"
-    # "i2c-nvidia_gpu"
     ];
   #boot.initrd.kernelModules = [ "nvidia" ];
   
@@ -71,7 +62,7 @@
     nvidiaSettings = true;
 
     # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
     # package = config.boot.kernelPackages.nvidiaPackages.production;
 
   };

systems/x86_64-linux/drivebystation-nix/steam.nix

@@ -24,52 +24,49 @@
 , ...
 }:{
   config = {
-    # programs.gamescope = {
+    programs.gamescope.enable = true;
-    #   enable = true;
-    #   capSysNice = true;
-    # };
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
       localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
 
-    #   gamescopeSession = {
+      gamescopeSession = {
-    #     enable = true;
+        enable = true;
-    #     env = {
+        env = {
-    #       WLR_RENDERER = "vulkan";
+          WLR_RENDERER = "vulkan";
-    #       DXVK_HDR = "0 ";
+          DXVK_HDR = "1 ";
-    #       ENABLE_GAMESCOPE_WSI = "0";
+          ENABLE_GAMESCOPE_WSI = "1";
-    #       WINE_FULLSCREEN_FSR = "1";
+          WINE_FULLSCREEN_FSR = "1";
-    #       # Games allegedly prefer X11
+          # Games allegedly prefer X11
-    #       SDL_VIDEODRIVER = "x11";
+          SDL_VIDEODRIVER = "x11";
-    #     };
+        };
-    #     args = [
+        args = [
-    #       "--xwayland-count 1"
+          "--xwayland-count 1"
-    #       "--expose-wayland"
+          "--expose-wayland"
 
-    #       "-e" # Enable steam integration
+          "-e" # Enable steam integration
-    #       "--steam"
+          "--steam"
 
-    #       # "--adaptive-sync"
+          "--adaptive-sync"
-    #       # "--hdr-enabled"
+          "--hdr-enabled"
-    #       # "--hdr-itm-enable"
+          "--hdr-itm-enable"
 
-    #       # External monitor
+          # External monitor
-    #       "--prefer-output DP-3"
+          "--prefer-output DP-3"
-    #       "--output-width 1920"
+          "--output-width 1920"
-    #       "--output-height 1080"
+          "--output-height 1080"
-    #       "-r 172"
+          "-r 172"
 
-    #       # Laptop display
+          # Laptop display
-    #       # "--prefer-output eDP-1"
+          # "--prefer-output eDP-1"
-    #       # "--output-width 2560"
+          # "--output-width 2560"
-    #       # "--output-height 1600"
+          # "--output-height 1600"
-    #       # "-r 120"
+          # "-r 120"
           
-    #       # "--prefer-vk-device 10de:1b81" # lspci -nn | grep VGA
+          "--prefer-vk-device 10de:1b81" # lspci -nn | grep VGA
-    #     ];
+        ];
-    #   };
+      };
     };
   };
 }

systems/x86_64-linux/drivebystation-nix/video.nix

@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  boot.kernelModules = [
-    "v4l2loopback" # Webcam loopback
-  ];
-  
-  boot.extraModulePackages = [
-    pkgs.linuxPackages.v4l2loopback # Webcam loopback
-  ];
-
-  boot.extraModprobeConfig = ''
-    options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
-  '';
-  
-  environment.systemPackages = with pkgs; [
-    # Webcam packages
-    v4l-utils
-    android-tools
-    adb-sync
-  ];
-}