update

5 files changed, 10 insertions, 31 deletions

diff --git a/config/way-displays/cfg.yaml b/config/way-displays/cfg.yaml
index 6dd76d6..74e247b 100644
--- a/config/way-displays/cfg.yaml
+++ b/config/way-displays/cfg.yaml
@@ -1,9 +1,9 @@
 # Arrange displays in a ROW (default, left to right) or a COLUMN (top to bottom)
-ARRANGE: ROW
+ARRANGE: COLUMN
 
 # Align ROWs at the TOP (default), MIDDLE or BOTTOM
 # Align COLUMNs at the LEFT (default), MIDDLE or RIGHT
-ALIGN: BOTTOM
+ALIGN: MIDDLE
 
 # The default ORDER is simply the order in which the displays are discovered.
 # Define your own.
@@ -11,43 +11,18 @@ ORDER:
   - 'HDMI-A-1'
   - 'eDP-1'
 
-# Enable scaling, overrides AUTO_SCALE and SCALE
 SCALING: FALSE
 
-# Override the preferred mode.
-# WARNING: this may result in an unusable display. See https://github.com/alex-courtis/way-displays#known-issues-with-workarounds
-# for a possible workaround.
 MODE:
-    # Resolution and refresh
     - NAME_DESC: HDMI-A-1
       MAX: TRUE
 
-    # Highest available
     - NAME_DESC: eDP-1
       MAX: TRUE
 
-# Rotate or translate the display.
-# 90, 180, 270, FLIPPED, FLIPPED-90, FLIPPED-180, FLIPPED-270
-TRANSFORM:
-  # - NAME_DESC: 'monitor description'
-  #   TRANSFORM: 270
-
-# VRR / adaptive sync is enabled by default. Disable it per display.
-VRR_OFF:
-  # - DP-2
-  # - '!.*my monitor.*'
-
-
 # Laptop displays usually start with eDP e.g. eDP-1. This may be overridden if
 # your laptop is different.
 LAPTOP_DISPLAY_PREFIX: 'eDP-1'
 
-
 # One of: ERROR, WARNING, INFO (default), DEBUG
 LOG_THRESHOLD: INFO
-
-
-# Disable the specified displays.
-DISABLED:
-  #- "eDP-1"
-
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index f736043..0a69e77 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -6,6 +6,7 @@
     inputs.home-manager.nixosModules.default
   ] ++ (map (path: ../../modules/${path}) [
     "core/global.nix"
+    "nvidia.nix"
     "core/audio.nix"
     "core/bluetooth.nix"
     "core/fonts.nix"
@@ -14,7 +15,6 @@
     "login.nix"
     "wm_utils.nix"
     "virtualization.nix"
-    "nvidia.nix"
   ]);
 
   boot.loader.systemd-boot.enable = true;
@@ -25,8 +25,6 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.allowUnfreePredicate = _: true;
 
-  hardware.opengl.enable = true;
-
   fileSystems."/data" = {
     device = "/dev/sda";
     fsType = "ext4";
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index 1d59539..f8f3bb7 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -15,9 +15,13 @@
     powerManagement.finegrained = false;
     open = false;
     nvidiaSettings = false;
-    package = config.boot.kernelPackages.nvidiaPackages.production;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
 
     prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
       intelBusId = "PCI:0:2:0";
       nvidiaBusId = "PCI:1:0:0";
     };
diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix
index b111a20..0fb0323 100644
--- a/modules/wm_utils.nix
+++ b/modules/wm_utils.nix
@@ -1,4 +1,5 @@
 { pkgs, ... }:
+
 {
   environment.systemPackages = with pkgs; [
     polkit_gnome
diff --git a/packages/tlauncher.nix b/packages/tlauncher.nix
index 4f23abd..2c464c8 100644
--- a/packages/tlauncher.nix
+++ b/packages/tlauncher.nix
@@ -6,6 +6,7 @@
 , fetchurl
 , copyDesktopItems
 }:
+
 let
   version = "2.895";
   src = stdenv.mkDerivation {