From cc835da43c811a75323cdd0330680d87f3bd7d97 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Mon, 17 Mar 2025 22:13:11 +1100
Subject: [PATCH] treewide: rename deprecated options

---
 modules/system/gui.nix      |  4 ++--
 modules/system/input.nix    | 16 ++++++++--------
 modules/system/packages.nix |  2 +-
 users/rin/wayland.nix       |  2 +-
 users/rin/xorg.nix          |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index f2e277c..128e850 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }: {
   fonts = {
-    enableDefaultFonts = true;
+    enableDefaultPackages = true;
     fontconfig = {
       defaultFonts = {
         serif = [ "NotoSerif" ];
@@ -8,7 +8,7 @@
         monospace = [ "CascadiaCode" ];
       };
     };
-    fonts = with pkgs; [
+    packages = with pkgs; [
       material-symbols
       material-icons
       cascadia-code
diff --git a/modules/system/input.nix b/modules/system/input.nix
index 17e5416..6eaf550 100644
--- a/modules/system/input.nix
+++ b/modules/system/input.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
   services.xserver = {
     displayManager = {
       xserverArgs = [
@@ -6,14 +6,14 @@
         "-arinterval 15"
       ];
     };
-    libinput = {
-      enable = true;
-      mouse = {
-        accelSpeed = "0";
-        accelProfile = "flat";
-      };
+    xkb.options = "caps:escape";
+  };
+  services.libinput = {
+    enable = true;
+    mouse = {
+      accelSpeed = "0";
+      accelProfile = "flat";
     };
-    xkbOptions = "caps:escape";
   };
   console.useXkbConfig = true;
 }
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index 3e34299..2f545a2 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -24,7 +24,7 @@
 }
 // (if !enableGUI then {} else {
   programs.adb.enable = true;
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     vaapiIntel
     vaapiVdpau
     libvdpau-va-gl
diff --git a/users/rin/wayland.nix b/users/rin/wayland.nix
index df32eea..8c877f2 100644
--- a/users/rin/wayland.nix
+++ b/users/rin/wayland.nix
@@ -5,7 +5,7 @@
     extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" "wireshark" ];
     shell = pkgs.zsh;
     uid = 1001;
-    passwordFile = config.age.secrets.passwd.path;
+    hashedPasswordFile = config.age.secrets.passwd.path;
   };
   home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
     home = {
diff --git a/users/rin/xorg.nix b/users/rin/xorg.nix
index 8668bb0..8a6b604 100644
--- a/users/rin/xorg.nix
+++ b/users/rin/xorg.nix
@@ -5,7 +5,7 @@
     extraGroups = [ "adbusers" "audio" "corectrl" "libvirtd" "networkmanager" "video" "wheel" ];
     shell = pkgs.zsh;
     uid = 1001;
-    passwordFile = config.age.secrets.passwd.path;
+    hashedPasswordFile = config.age.secrets.passwd.path;
   };
   home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
     home = {