From 7aedf97feb5aff450441cd93d7b6ebe9f43c9cfc Mon Sep 17 00:00:00 2001
From: "RingOfStorms (Joshua Bell)" <ringofstorms@gmail.com>
Date: Sun, 30 Nov 2025 00:49:21 -0600
Subject: [PATCH] attempt some fixes

---
 flakes/de_plasma/de_plasma.nix              | 22 ++++++++++-----------
 flakes/de_plasma/home_manager/shortcuts.nix |  4 ++--
 flakes/de_plasma/home_manager/theme.nix     |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/flakes/de_plasma/de_plasma.nix b/flakes/de_plasma/de_plasma.nix
index 22259899..4c73ba2f 100644
--- a/flakes/de_plasma/de_plasma.nix
+++ b/flakes/de_plasma/de_plasma.nix
@@ -233,10 +233,10 @@ in
         enable = true;
         wayland.enable = cfg.wayland;
         theme = "breeze";
-        autoLogin = mkIf (cfg.sddm.autologinUser != null) {
-          enable = true;
-          user = cfg.sddm.autologinUser;
-        };
+      };
+      services.displayManager.autoLogin = mkIf (cfg.sddm.autologinUser != null) {
+        enable = true;
+        user = cfg.sddm.autologinUser;
       };
       services.desktopManager.plasma6.enable = true;
 
@@ -259,9 +259,9 @@ in
       environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
       # OpenGL base
-      hardware.opengl = {
+      hardware.graphics = {
         enable = true;
-        driSupport32Bit = cfg.gpu.enable32Bit;
+        enable32Bit = cfg.gpu.enable32Bit;
       };
 
       # KDEConnect
@@ -279,7 +279,7 @@ in
 
       # Home Manager modules (plasma-manager + our HM layer)
       home-manager.sharedModules = [
-        plasma-manager.homeManagerModules.plasma-manager
+        plasma-manager.homeModules.plasma-manager
         ./home_manager
       ];
     }
@@ -317,11 +317,11 @@ in
     # GPU blocks
     (mkIf cfg.gpu.amd.enable {
       services.xserver.videoDrivers = [ "amdgpu" ];
-      hardware.opengl.extraPackages = with pkgs; [
+      hardware.graphics.extraPackages = with pkgs; [
         vaapiVdpau
         libvdpau-va-gl
       ];
-      hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
+      hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [
         libva
         vaapiVdpau
         libvdpau-va-gl
@@ -331,14 +331,14 @@ in
 
     (mkIf cfg.gpu.intel.enable {
       services.xserver.videoDrivers = [ "modesetting" ];
-      hardware.opengl.extraPackages =
+      hardware.graphics.extraPackages =
         with pkgs;
         [
           intel-media-driver
           libvdpau-va-gl
         ]
         ++ optionals cfg.gpu.intel.legacyVaapi [ pkgs.vaapiIntel ];
-      hardware.opengl.extraPackages32 =
+      hardware.graphics.extraPackages32 =
         with pkgs.pkgsi686Linux;
         [
           libva
diff --git a/flakes/de_plasma/home_manager/shortcuts.nix b/flakes/de_plasma/home_manager/shortcuts.nix
index f80b236e..f8cf3ef0 100644
--- a/flakes/de_plasma/home_manager/shortcuts.nix
+++ b/flakes/de_plasma/home_manager/shortcuts.nix
@@ -36,7 +36,7 @@ in
     );
 
     programs.plasma.hotkeys.commands = {
-      ringofstorms_terminal = {
+      ringofstorms-terminal = {
         key = "Meta+Return";
         command = cfg.shortcuts.terminal;
       };
@@ -44,7 +44,7 @@ in
     // (
       if cfg.shortcuts.launcher == "rofi" then
         {
-          ringofstorms_launcher = {
+          ringofstorms-launcher = {
             key = "Meta+Space";
             command = "rofi -show drun";
           };
diff --git a/flakes/de_plasma/home_manager/theme.nix b/flakes/de_plasma/home_manager/theme.nix
index ef196daf..1fca1251 100644
--- a/flakes/de_plasma/home_manager/theme.nix
+++ b/flakes/de_plasma/home_manager/theme.nix
@@ -14,7 +14,7 @@ in
       workspace = {
         colorScheme = "Breeze Dark";
         lookAndFeel = "org.kde.breezedark.desktop";
-        cursorTheme = "breeze_cursors";
+        cursor.theme = "breeze_cursors";
       };
       fonts = { }; # keep defaults
       kscreenlocker = { }; # swaylock analog not applicable; left default