aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Desktop/SDDM] drop sddm-unstable hacks and uneeded config for NixOS 24.05

Browse source
This commit is contained in:
Antoine Viallon 2024-05-23 10:47:56 +02:00
parent 244c878108
commit 337de7ccd4
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
2 changed files with 2 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

32
desktop/sddm-unstable.nix
View file

@ -1,32 +0,0 @@
{ config, nixpkgs-unstable, lib, pkgs, ... }:
with lib;
let
cfg = config.aviallon.desktop;
in {
disabledModules = [
"services/x11/display-managers/sddm.nix"
"services/x11/display-managers/default.nix"
"services/x11/window-managers/default.nix"
];
imports = [
(import (nixpkgs-unstable + /nixos/modules/services/display-managers/sddm.nix))
(import (nixpkgs-unstable + /nixos/modules/services/display-managers/default.nix))
(import (nixpkgs-unstable + /nixos/modules/services/x11/window-managers/default.nix))
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "session" ] [ "services" "displayManager" "session" ])
];
config = {
services.displayManager.sddm.wayland.compositor = "kwin";
nixpkgs.overlays = [
(final: prev: {
sddm = final.libsForQt5.sddm;
libsForQt5 = prev.libsForQt5.overrideScope (f: p: {
sddm = f.callPackage (import (nixpkgs-unstable + /pkgs/applications/display-managers/sddm)) {};
});
kdePackages = final.libsForQt5;
})
];
};
}

17
desktop/sddm.nix
View file

@ -7,30 +7,17 @@ in {
options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM"; options.aviallon.desktop.sddm.unstable = mkEnableOption "bleeding-edge SDDM";
options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration"; options.aviallon.desktop.sddm.enable = mkEnableOption "custom SDDM configuration";
imports = [ ./sddm-unstable.nix ];
config = mkIf cfg.sddm.enable { config = mkIf cfg.sddm.enable {
# Delete SDDM QMLCache
systemd.tmpfiles.rules = mkAfter [
"e ${config.users.users.sddm.home}/.cache/sddm-greeter/qmlcache/ - - - 0"
];
# Prevents blinking cursor # Prevents blinking cursor
services.xserver.displayManager.sddm = { services.displayManager.sddm = {
enable = true; enable = true;
wayland.enable = mkDefault true; wayland.enable = mkDefault true;
wayland.compositor = "kwin";
settings = { settings = {
/*General.GreeterEnvironment = mkIf sddmCfg.wayland.enable (concatStringsSep "," [
"QT_WAYLAND_SHELL_INTEGRATION=layer-shell"
"QT_QPA_PLATFORM=wayland"
]);*/
Theme = { Theme = {
CursorTheme = "breeze_cursors"; CursorTheme = "breeze_cursors";
}; };
/*Wayland = mkIf sddmCfg.wayland.enable {
CompositorCommand = mkOverride 60 "${pkgs.libsForQt5.kwin}/bin/kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1";
};*/
}; };
}; };