attempt some fixes

This commit is contained in:
RingOfStorms (Joshua Bell) 2025-11-30 00:49:21 -06:00
parent a0afc24f2d
commit 7aedf97feb
3 changed files with 14 additions and 14 deletions

View file

@ -233,11 +233,11 @@ in
enable = true; enable = true;
wayland.enable = cfg.wayland; wayland.enable = cfg.wayland;
theme = "breeze"; theme = "breeze";
autoLogin = mkIf (cfg.sddm.autologinUser != null) { };
services.displayManager.autoLogin = mkIf (cfg.sddm.autologinUser != null) {
enable = true; enable = true;
user = cfg.sddm.autologinUser; user = cfg.sddm.autologinUser;
}; };
};
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
# Portals # Portals
@ -259,9 +259,9 @@ in
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
# OpenGL base # OpenGL base
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport32Bit = cfg.gpu.enable32Bit; enable32Bit = cfg.gpu.enable32Bit;
}; };
# KDEConnect # KDEConnect
@ -279,7 +279,7 @@ in
# Home Manager modules (plasma-manager + our HM layer) # Home Manager modules (plasma-manager + our HM layer)
home-manager.sharedModules = [ home-manager.sharedModules = [
plasma-manager.homeManagerModules.plasma-manager plasma-manager.homeModules.plasma-manager
./home_manager ./home_manager
]; ];
} }
@ -317,11 +317,11 @@ in
# GPU blocks # GPU blocks
(mkIf cfg.gpu.amd.enable { (mkIf cfg.gpu.amd.enable {
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
hardware.opengl.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
]; ];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [
libva libva
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
@ -331,14 +331,14 @@ in
(mkIf cfg.gpu.intel.enable { (mkIf cfg.gpu.intel.enable {
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];
hardware.opengl.extraPackages = hardware.graphics.extraPackages =
with pkgs; with pkgs;
[ [
intel-media-driver intel-media-driver
libvdpau-va-gl libvdpau-va-gl
] ]
++ optionals cfg.gpu.intel.legacyVaapi [ pkgs.vaapiIntel ]; ++ optionals cfg.gpu.intel.legacyVaapi [ pkgs.vaapiIntel ];
hardware.opengl.extraPackages32 = hardware.graphics.extraPackages32 =
with pkgs.pkgsi686Linux; with pkgs.pkgsi686Linux;
[ [
libva libva

View file

@ -36,7 +36,7 @@ in
); );
programs.plasma.hotkeys.commands = { programs.plasma.hotkeys.commands = {
ringofstorms_terminal = { ringofstorms-terminal = {
key = "Meta+Return"; key = "Meta+Return";
command = cfg.shortcuts.terminal; command = cfg.shortcuts.terminal;
}; };
@ -44,7 +44,7 @@ in
// ( // (
if cfg.shortcuts.launcher == "rofi" then if cfg.shortcuts.launcher == "rofi" then
{ {
ringofstorms_launcher = { ringofstorms-launcher = {
key = "Meta+Space"; key = "Meta+Space";
command = "rofi -show drun"; command = "rofi -show drun";
}; };

View file

@ -14,7 +14,7 @@ in
workspace = { workspace = {
colorScheme = "Breeze Dark"; colorScheme = "Breeze Dark";
lookAndFeel = "org.kde.breezedark.desktop"; lookAndFeel = "org.kde.breezedark.desktop";
cursorTheme = "breeze_cursors"; cursor.theme = "breeze_cursors";
}; };
fonts = { }; # keep defaults fonts = { }; # keep defaults
kscreenlocker = { }; # swaylock analog not applicable; left default kscreenlocker = { }; # swaylock analog not applicable; left default