From efbf50f860f57a02f9e15677aafc4f61aa71c88d Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 5 Mar 2025 10:57:06 -0600 Subject: [PATCH] fix nvidia and ozone env var --- nixos/home/jahanson/sworkstation.nix | 2 ++ nixos/home/modules/de/hyprland.nix | 4 --- nixos/hosts/shadowfax/default.nix | 51 +++++++++++++++++++++------- nixos/hosts/telchar/default.nix | 26 ++++++++------ 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/nixos/home/jahanson/sworkstation.nix b/nixos/home/jahanson/sworkstation.nix index cd77c85..c986840 100644 --- a/nixos/home/jahanson/sworkstation.nix +++ b/nixos/home/jahanson/sworkstation.nix @@ -28,8 +28,10 @@ packages = with pkgs; [ # apps solaar # open source manager for logitech unifying receivers + unstable.seabird # unstable.vesktop # gpu issues. Using the flatpak version solves this issue. vlc + yt-dlp ]; }; }; diff --git a/nixos/home/modules/de/hyprland.nix b/nixos/home/modules/de/hyprland.nix index 752b7b2..31e4393 100644 --- a/nixos/home/modules/de/hyprland.nix +++ b/nixos/home/modules/de/hyprland.nix @@ -12,10 +12,6 @@ in { imports = [inputs.ags.homeManagerModules.default]; config = mkIf cfg.enable { - environment.sessionVariables = { - # Wayland and Chromium/Electron apps. - NIXOS_OZONE_WL = "1"; - }; # Downloads the Theme Resources home.packages = with pkgs; [ andromeda-gtk-theme diff --git a/nixos/hosts/shadowfax/default.nix b/nixos/hosts/shadowfax/default.nix index 92fe1c7..f9caa90 100644 --- a/nixos/hosts/shadowfax/default.nix +++ b/nixos/hosts/shadowfax/default.nix @@ -69,8 +69,29 @@ in { hardware = { cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - nvidia.open = true; - graphics.enable = true; + nvidia = { + modesetting.enable = true; + nvidiaSettings = true; + open = false; + package = config.boot.kernelPackages.nvidiaPackages.latest; + powerManagement = { + enable = false; + finegrained = false; + }; + }; + graphics = { + enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau + libvdpau-va-gl + nvidia-vaapi-driver + vdpauinfo + libva + libva-utils + ]; + }; # opengl.enable = true; nvidia-container-toolkit.enable = true; }; @@ -100,16 +121,22 @@ in { }; }; - # System packages - environment.systemPackages = with pkgs; [ - # dev - uv - # fun - fastfetch - # Scripts - pushoverNotify - refreshSeries - ]; + environment = { + sessionVariables = { + # Wayland and Chromium/Electron apps. + NIXOS_OZONE_WL = "1"; + }; + # System packages + systemPackages = with pkgs; [ + # dev + uv + # fun + fastfetch + # Scripts + pushoverNotify + refreshSeries + ]; + }; # enable docker socket at /run/docker.sock virtualisation.podman.dockerSocket.enable = true; diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix index 0ceae40..d370d60 100644 --- a/nixos/hosts/telchar/default.nix +++ b/nixos/hosts/telchar/default.nix @@ -4,16 +4,22 @@ virtualisation.docker.enable = true; # System packages - environment.systemPackages = with pkgs; [ - # myPkgs.modrinth-app-unwrapped - dconf-editor - fastfetch - gtk3 - nodejs_22 - pavucontrol # Pulseaudio volume control - vesktop # Discord custom client - zulu # Java OpenJDK - ]; + environment = { + sessionVariables = { + # Wayland and Chromium/Electron apps. + NIXOS_OZONE_WL = "1"; + }; + systemPackages = with pkgs; [ + # myPkgs.modrinth-app-unwrapped + dconf-editor + fastfetch + gtk3 + nodejs_22 + pavucontrol # Pulseaudio volume control + vesktop # Discord custom client + zulu # Java OpenJDK + ]; + }; services = { # Tailscale