diff --git a/configuration.nix b/configuration.nix index 6411c40..3f2fdff 100644 --- a/configuration.nix +++ b/configuration.nix @@ -214,6 +214,8 @@ ]; }; kernelParams = [ + # attempt to fix nvidia perf + "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915" "quiet" "splash" "boot.shell_on_fail" @@ -228,6 +230,15 @@ swraid.enable = false; initrd.systemd.enable = true; + + # OBS Studio virtual camera + extraModulePackages = with config.boot.kernelPackages; [ + v4l2loopback + ]; + extraModprobeConfig = '' + options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 + options nvidia_drm modeset=1 fbdev=1 + ''; }; boot.loader.timeout = 0; @@ -261,6 +272,7 @@ open = false; modesetting.enable = true; powerManagement.enable = true; + nvidiaSettings = true; prime = { # hardware specific, beware! amdgpuBusId = lib.mkForce "PCI:06:00:0"; @@ -269,14 +281,6 @@ }; security.polkit.enable = true; - # OBS Studio virtual camera - boot.extraModulePackages = with config.boot.kernelPackages; [ - v4l2loopback - ]; - boot.extraModprobeConfig = '' - options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 - options nvidia_drm modeset=1 fbdev=1 - ''; # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ diff --git a/flake.lock b/flake.lock index e3f6b08..341c79d 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1733951536, - "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1733324289, - "narHash": "sha256-5gCIIiQT9JlBPO1M98j1Aaboa2CTKtwBqiksCLf6qC0=", + "lastModified": 1735838245, + "narHash": "sha256-dA2s+KFo6+TmYtQoXWfxQ8XukN6JQ0I0VoraG9zD7/I=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "2530394e67b436f4aea8225111cf37c1403ccb78", + "rev": "920af33577a889772e96a067130252df5674ca8a", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1734140730, - "narHash": "sha256-BG6y/y2ieDLGOs9bxnnYGfAuGdMMM/U8lg0SKLLB/JI=", + "lastModified": 1735868406, + "narHash": "sha256-/CGzY7MUnhmw+I9j8ApwDt7qOKixWif2khwXEIR97Bc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "3a6e0ed3690b565fb91f5ad242c493e46d8cc3a2", + "rev": "afc74611082ecc4a961e4317fa2763c8812e217f", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733376361, - "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=", + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1733509971, - "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", + "lastModified": 1734207213, + "narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", "ref": "refs/heads/main", - "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", - "revCount": 865, + "rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", + "revCount": 869, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"