From 1b9ea8a3e6fea90d54c474846ab059038227ab2c Mon Sep 17 00:00:00 2001
From: Quinn Unger <quinn.unger@pm.me>
Date: Wed, 12 Aug 2026 19:04:59 +0100
Subject: [PATCH] sidonia.graphics.legacyGpu -> sidonia.legacyGpu

---
 common/hm/compositor/niri.nix              | 2 +-
 common/hm/noctalia/compositorOverrides.nix | 2 +-
 common/hm/noctalia/noctalia.nix            | 6 +++---
 common/hm/programs/sublime.nix             | 4 ++--
 common/os/niri.nix                         | 2 +-
 flake.lock                                 | 8 ++++----
 hosts/shizuka/default.nix                  | 3 +++
 hosts/yure/default.nix                     | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/common/hm/compositor/niri.nix b/common/hm/compositor/niri.nix
index 0d05b44..0c91184 100644
--- a/common/hm/compositor/niri.nix
+++ b/common/hm/compositor/niri.nix
@@ -99,7 +99,7 @@ lib.mkIf (cfg.desktop.enable && (cfg.desktop.compositor == "niri")) {
         hotkey-overlay.skip-at-startup = [ ];
         gestures.hot-corners.off = [ ];
       }
-      (lib.mkIf (!cfg.graphics.legacyGpu) {
+      (lib.mkIf (!cfg.legacyGpu) {
         window-rule = [
           {
             background-effect.blur = true;
diff --git a/common/hm/noctalia/compositorOverrides.nix b/common/hm/noctalia/compositorOverrides.nix
index 0c2d86a..62ed127 100644
--- a/common/hm/noctalia/compositorOverrides.nix
+++ b/common/hm/noctalia/compositorOverrides.nix
@@ -29,7 +29,7 @@ lib.mkIf
           place-within-backdrop = true;
         }
       ]
-      ++ (lib.optionals (!cfg.graphics.legacyGpu) [
+      ++ (lib.optionals (!cfg.legacyGpu) [
         {
           match._props.namespace._raw = ''"^noctalia-(bar-[^\"]+|notification|dock|panel|attached-panel|osd)$"'';
           background-effect.xray = false;
diff --git a/common/hm/noctalia/noctalia.nix b/common/hm/noctalia/noctalia.nix
index 04fac7e..fdcea22 100644
--- a/common/hm/noctalia/noctalia.nix
+++ b/common/hm/noctalia/noctalia.nix
@@ -28,8 +28,8 @@ lib.mkIf (cfg.desktop.enable && (cfg.desktop.shell == "noctalia")) {
         launch_apps_as_systemd_services = true;
         telemetry_enabled = false;
         polkit_agent = true;
-        animation.enabled = (!cfg.graphics.legacyGpu);
-        panel.transparency_mode = if cfg.graphics.legacyGpu then "solid" else "soft"; # solid | soft | glass
+        animation.enabled = (!cfg.legacyGpu);
+        panel.transparency_mode = if cfg.legacyGpu then "solid" else "soft"; # solid | soft | glass
         font_family = "monospace";
         shadow = false;
       };
@@ -49,7 +49,7 @@ lib.mkIf (cfg.desktop.enable && (cfg.desktop.shell == "noctalia")) {
           interval_seconds = 15 * 60;
         };
       };
-      backdrop.enabled = lib.mkDefault (!cfg.graphics.legacyGpu);
+      backdrop.enabled = lib.mkDefault (!cfg.legacyGpu);
       dock = lib.mapAttrs (n: v: lib.mkDefault v) {
         enabled = false;
         shadow = false;
diff --git a/common/hm/programs/sublime.nix b/common/hm/programs/sublime.nix
index f9e2c92..710cc1b 100644
--- a/common/hm/programs/sublime.nix
+++ b/common/hm/programs/sublime.nix
@@ -17,7 +17,7 @@ lib.mkIf cfg.desktop.enable {
       font_size = 10;
       translate_tabs_to_spaces = true;
       index_files = true;
-      hardware_acceleration = if cfg.graphics.legacyGpu then "none" else "opengl";
+      hardware_acceleration = if cfg.legacyGpu then "none" else "opengl";
       update_check = false;
       sublime_merge_path = lib.getExe pkgs.sublime-merge;
     };
@@ -44,7 +44,7 @@ lib.mkIf cfg.desktop.enable {
         translate_tabs_to_spaces = true;
         side_bar_layout = "tabs";
         font_size = 10;
-        hardware_acceleration = if cfg.graphics.legacyGpu then "none" else "opengl";
+        hardware_acceleration = if cfg.legacyGpu then "none" else "opengl";
         update_check = false;
       }
       (lib.mkIf config.programs.sublime4.enable {
diff --git a/common/os/niri.nix b/common/os/niri.nix
index 46bdf1c..63b6a2e 100644
--- a/common/os/niri.nix
+++ b/common/os/niri.nix
@@ -10,7 +10,7 @@ in
 lib.mkIf (cfg.desktop.enable && (cfg.desktop.compositor == "niri")) {
   programs.niri = {
     enable = true;
-    package = lib.mkDefault (if cfg.graphics.legacyGpu then pkgs.niri-legacy else pkgs.niri);
+    package = lib.mkDefault (if cfg.legacyGpu then pkgs.niri-legacy else pkgs.niri);
     useNautilus = lib.mkDefault false;
     withUWSM = lib.mkDefault true;
     withXDG = lib.mkDefault true;
diff --git a/flake.lock b/flake.lock
index b09db5e..8dfe6e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -926,11 +926,11 @@
         "zen-browser": "zen-browser"
       },
       "locked": {
-        "lastModified": 1786383446,
-        "narHash": "sha256-3TuDxfzyfrIX2KmByx5XCVdHZ76Z9F2pLsAMM70ptXs=",
+        "lastModified": 1786557775,
+        "narHash": "sha256-yC/wSupmUasAkAKeNYCd0FnbDacn8umkMPud4cIDwEk=",
         "ref": "refs/heads/main",
-        "rev": "c0a8d0db4853aab4f44edd292e2205ad6c87c08e",
-        "revCount": 466,
+        "rev": "c28de759cd7740dda1184936cc9018caac806544",
+        "revCount": 467,
         "type": "git",
         "url": "https://tangled.org/moppu.dev/sidonia"
       },
diff --git a/hosts/shizuka/default.nix b/hosts/shizuka/default.nix
index 311dea2..a33cf76 100644
--- a/hosts/shizuka/default.nix
+++ b/hosts/shizuka/default.nix
@@ -33,6 +33,9 @@
       pkgs.pciutils
       pkgs.mesa-demos
     ];
+    wayland.windowManager.niri.settings = {
+      input.touchpad.scroll-factor = 0.8;
+    };
     wayland.desktopManager.sidonia.keybinds = [
       {
         name = "Bemenu (Discrete GPU)";
diff --git a/hosts/yure/default.nix b/hosts/yure/default.nix
index 7914716..2b3a886 100644
--- a/hosts/yure/default.nix
+++ b/hosts/yure/default.nix
@@ -23,7 +23,7 @@
     userName = "shinatose";
     ssh.pubKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICw5RRyu1jEMpS5ekIfbdaHtWU/IyZ62LhfqK8xUIjGY shinatose@yure";
     services.distributedBuilds.client.enable = true;
-    graphics.legacyGpu = true;
+    legacyGpu = true;
     desktop.enable = true;
     geolocation.enable = true;
     text.comicCode.enable = true;
-- 
2.51.2