From e4babb3003e6f88c00af509903616dc0ec790a5b Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 14 Mar 2023 20:57:39 -0400 Subject: [PATCH 1/2] fixed inaccurate boot image location --- modules/boot/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/boot/default.nix b/modules/boot/default.nix index e93715a..fdbbb05 100644 --- a/modules/boot/default.nix +++ b/modules/boot/default.nix @@ -1,4 +1,8 @@ -inputs: {lib, ...}: { +inputs: { + lib, + self, + ... +}: { imports = [(import ./stage2patch.nix inputs)]; environment.etc = { "issue" = { @@ -14,7 +18,7 @@ inputs: {lib, ...}: { plymouth = { enable = lib.mkDefault true; theme = "breeze"; - logo = ../misc/nixos.png; + logo = "${self}/misc/nixos.png"; }; loader = { systemd-boot = { From 478a7757aadcef6986996c5a3edae2641af5179f Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 14 Mar 2023 20:58:30 -0400 Subject: [PATCH 2/2] added obs vlc and prime-run to laptop --- systems/game-laptop/default.nix | 12 +++++++++++- systems/game-laptop/prime.nix | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix index 5df4e0f..9bc19c2 100644 --- a/systems/game-laptop/default.nix +++ b/systems/game-laptop/default.nix @@ -35,6 +35,16 @@ inputs: { pkgs.pcmanfm #file manager pkgs.librewolf #best browser pkgs.webcord + (pkgs.obs-studio.overrideAttrs (old: rec { + preFixup = + old.preFixup + + '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" + ) + ''; + })) + pkgs.vlc ]; networking = { hostName = "game-laptop"; @@ -49,7 +59,7 @@ inputs: { useDefaultShell = true; uid = 1000; isNormalUser = true; - extraGroups = ["networkmanager" "audio"]; + extraGroups = ["audio"]; initialHashedPassword = ""; }; "root" = { diff --git a/systems/game-laptop/prime.nix b/systems/game-laptop/prime.nix index 4252fa8..3c78d1b 100644 --- a/systems/game-laptop/prime.nix +++ b/systems/game-laptop/prime.nix @@ -1,4 +1,17 @@ -_: {config, ...}: { +_: { + config, + pkgs, + ... +}: let + prime-run = pkgs.writeShellScriptBin "prime-run" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + ''; +in { + environment.systemPackages = [prime-run]; hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.latest; prime = {