diff --git a/modules/graphical/sddm.nix b/modules/graphical/sddm.nix index 347a733..452cd0c 100644 --- a/modules/graphical/sddm.nix +++ b/modules/graphical/sddm.nix @@ -11,10 +11,12 @@ in { }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ (pkgs.sddm-astronaut.override { embeddedTheme = "pixel_sakura";}) ]; services = { displayManager.sddm = { enable = true; - theme = "${pkgs.sddm-astronaut}"; + theme = "sddm-astronaut-theme"; + extraPackages = [ (pkgs.sddm-astronaut.override { embeddedTheme = "pixel_sakura";}) ]; #wayland.enable = true; #sddm.theme = "breeze"; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 4cc0692..c4cb0f6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,7 +9,7 @@ kop-website = pkgs.callPackage ./website/default.nix { inherit kop-hub ente-frontend; }; scheibnkleister-presence = pkgs.callPackage ./scheibnkleister-presence/default.nix { }; - sddm-astronaut = pkgs.callPackage ./sddm-astronaut/default.nix { }; + custom-sddm-astronaut = pkgs.callPackage ./sddm-astronaut/default.nix { }; mangal-patched = pkgs.callPackage ./mangal/default.nix { }; csharp-ls-8 = pkgs.callPackage ./csharp-lsp/default.nix { }; gpu-screen-recorder-ui = pkgs.callPackage ./gpu-screen-recorder-ui/default.nix { }; diff --git a/pkgs/sddm-astronaut/default.nix b/pkgs/sddm-astronaut/default.nix index fa7a863..40eb7c9 100644 --- a/pkgs/sddm-astronaut/default.nix +++ b/pkgs/sddm-astronaut/default.nix @@ -8,6 +8,16 @@ pkgs.stdenv.mkDerivation { hash = "sha256-j8pJvBml2LWxXNw1e/cSVXV+6w+K1lahv0uK1B9OYn0="; rev = "6726b5e951a13d308bf17aa09e91a349d82c997b"; }; + # Tip: use diff -ur to create patches + patches = [ (pkgs.writeText "astronaut-patch" '' +--- a/metadata.desktop ++++ b/metadata.desktop +@@ -9,3 +9,4 @@ + MainScript=Main.qml + ConfigFile=theme.conf + Theme-Id=sddm-astronaut ++QTVersion=6 + '') ]; installPhase = '' mkdir -p $out cp -R ./* $out/