mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-06 01:38:06 +00:00
[Desktop/Plasma+Flake] Add bleeding-edge sddm support, and track releases with flake
This commit is contained in:
parent
b248aa959f
commit
9ca0bae365
1 changed files with 8 additions and 10 deletions
|
|
@ -1,17 +1,12 @@
|
||||||
{config, pkgs, lib, ...}:
|
{config, pkgs, lib, sddm-unstable, ...}:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.aviallon.desktop;
|
cfg = config.aviallon.desktop;
|
||||||
optimizeCfg = config.aviallon.optimizations;
|
optimizeCfg = config.aviallon.optimizations;
|
||||||
_sddm = pkgs.sddm.overrideAttrs (old: rec {
|
_sddm_new = pkgs.sddm.overrideAttrs (old: rec {
|
||||||
pname = old.pname + "-git";
|
pname = old.pname + "-unstable";
|
||||||
version = "2023-05-12";
|
version = sddm-unstable.lastModifiedDate;
|
||||||
src = pkgs.fetchFromGitHub {
|
src = sddm-unstable;
|
||||||
owner = "sddm";
|
|
||||||
repo = "sddm";
|
|
||||||
rev = "58a35178b75aada974088350f9b89db45f5c3800";
|
|
||||||
sha256 = "sha256-lTfsMUnYu3E2L25FSrMDkh9gB5X2fC0a5rvpMnPph4k=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = filter (x: hasSuffix "sddm-ignore-config-mtime.patch" x) old.patches;
|
patches = filter (x: hasSuffix "sddm-ignore-config-mtime.patch" x) old.patches;
|
||||||
|
|
||||||
|
|
@ -25,9 +20,12 @@ let
|
||||||
|
|
||||||
outputs = (old.outputs or [ "out" ]) ++ [ "man" ];
|
outputs = (old.outputs or [ "out" ]) ++ [ "man" ];
|
||||||
});
|
});
|
||||||
|
_sddm = if cfg.sddm.unstable then _sddm_new else pkgs.sddm;
|
||||||
sddmOptimized = optimizeCfg.optimizePkg { recursive = 0; } _sddm;
|
sddmOptimized = optimizeCfg.optimizePkg { recursive = 0; } _sddm;
|
||||||
sddmPackage = if optimizeCfg.enable then sddmOptimized else _sddm;
|
sddmPackage = if optimizeCfg.enable then sddmOptimized else _sddm;
|
||||||
in {
|
in {
|
||||||
|
options.aviallon.desktop.sddm.unstable = mkEnableOption (mdDoc "bleeding-edge SDDM");
|
||||||
|
|
||||||
config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
|
config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
|
||||||
# Enable the Plasma 5 Desktop Environment.
|
# Enable the Plasma 5 Desktop Environment.
|
||||||
services.xserver.desktopManager.plasma5 = {
|
services.xserver.desktopManager.plasma5 = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue