fix(fuji): desperate attempt at making firefox work

uku3lig · Jun 9, 2024 · e9fff62 · e9fff62
1 parent 86c7ae8
commit e9fff62
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/configs/desktop.nix b/configs/desktop.nix
@@ -63,6 +63,7 @@
     home = {
       packages = with pkgs; [
         # font-manager
+        chromium
         gimp
         gnome.gnome-calculator
         gparted

diff --git a/programs/gnome.nix b/programs/gnome.nix
@@ -4,25 +4,19 @@
     displayManager.defaultSession = "gnome";
   };
 
-  environment = {
-    gnome.excludePackages =
-      (with pkgs; [
-        gnome-tour
-      ])
-      ++ (with pkgs.gnome; [
-        cheese # webcam tool
-        gnome-terminal
-        epiphany # web browser
-        geary # email reader
-        totem # video player
-        tali # poker game
-        iagno # go game
-        hitori # sudoku game
-        atomix # puzzle game
-      ]);
-
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
-    };
-  };
+  environment.gnome.excludePackages =
+    (with pkgs; [
+      gnome-tour
+    ])
+    ++ (with pkgs.gnome; [
+      cheese # webcam tool
+      gnome-terminal
+      epiphany # web browser
+      geary # email reader
+      totem # video player
+      tali # poker game
+      iagno # go game
+      hitori # sudoku game
+      atomix # puzzle game
+    ]);
 }
diff --git a/systems/fuji/nvidia.nix b/systems/fuji/nvidia.nix
@@ -6,6 +6,16 @@
 }: {
   services.xserver.videoDrivers = lib.mkForce ["nvidia"];
 
+  boot.kernelParams = [
+    "nvidia.NVreg_EnableGpuFirmware=0"
+  ];
+
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+    LIBVA_DRIVER_NAME = "nvidia";
+    __EGL_VENDOR_LIBRARY_FILENAMES = "/run/opengl-driver/share/glvnd/egl_vendor.d/10_nvidia.json";
+  };
+
   hardware.opengl = {
     driSupport = true;
     driSupport32Bit = true;
@@ -21,16 +31,10 @@
     };
   };
 
-  # boot.extraModprobeConfig = ''
-  #   options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
-  # '';
-
   hm.wayland.windowManager.hyprland.settings.env = [
-    "LIBVA_DRIVER_NAME,nvidia"
     "XDG_SESSION_TYPE,wayland"
     "GBM_BACKEND,nvidia-drm"
     "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-    "__EGL_VENDOR_LIBRARY_FILENAMES,/run/opengl-driver/share/glvnd/egl_vendor.d/10_nvidia.json"
     "NVD_BACKEND,direct"
   ];
 }