Switch SDDM to greetd

This commit is contained in:
2023-01-19 15:17:15 +01:00
parent 6f0028d75e
commit 7b463d06ff
13 changed files with 243 additions and 249 deletions

View File

@@ -0,0 +1,31 @@
{
stdenv
, lib, fetchFromGitLab
, meson, ninja, pkg-config
, qtbase, wrapQtAppsHook
, wlroots_0_16, wayland, pixman
, dfl-applications, dfl-utils, dfl-ipc, wayqt
}:
stdenv.mkDerivation {
pname = "qtgreet";
version = "20230117";
src = fetchFromGitLab {
owner = "marcusbritanicus";
repo = "QtGreet";
rev = "666603c38bbc408fd56126f3c8508009edf8dc44";
sha256 = "0gigmlg4a0ddzhfnkhbrh67m23g6vhzayfv4gbvqjmkky91qnz93";
};
mesonFlags = [
"-Dnodynpath=true"
];
buildInputs = [
qtbase meson ninja pkg-config
wlroots_0_16 wayland pixman
wayqt dfl-applications dfl-ipc dfl-utils
];
nativeBuildInputs = [ wrapQtAppsHook ];
}

View File

@@ -37,8 +37,15 @@ let
})).override {
wf-config = wf-config_0_8;
};
dfl-ipc = prev.libsForQt5.callPackage development/cpp/dfl-ipc {};
wayqt = prev.libsForQt5.callPackage development/cpp/wayqt {};
dfl-utils = prev.libsForQt5.callPackage development/cpp/dfl-utils {};
dfl-applications = prev.libsForQt5.callPackage development/cpp/dfl-app {
inherit dfl-ipc;
};
in {
inherit discord-system-electron;
inherit discord-system-electron dfl-ipc dfl-applications dfl-utils wayqt;
vfio-isolate = prev.callPackage ./tools/virtualisation/vfio-isolate {};
mopidy-funkwhale = prev.callPackage ./applications/audio/mopidy/funkwhale.nix {};
@@ -56,6 +63,7 @@ in {
pySmartDL = pySmartDL;
cfscrape = cfscrape;
};
animdl = prev.callPackage ./misc/video/animdl {};
surface-control = prev.callPackage ./tools/system/surface-control {};
@@ -71,7 +79,6 @@ in {
psst = prev.callPackage tools/audio/psst {};
wlrootsqt = prev.libsForQt5.callPackage ./wlrootsqt.nix {};
qtgreet = prev.libsForQt5.callPackage ./qtgreet.nix {};
#spice-gtk = prev.callPackage temp/spice-gtk/default.nix {};
@@ -91,5 +98,7 @@ in {
custom-apparmor-utils = prev.callPackage temp/apparmor-utils.nix {};
authelia = prev.callPackage temp/authelia.nix {};
qtgreet = prev.libsForQt5.callPackage applications/desktop/qtgreet {
inherit dfl-applications dfl-utils dfl-ipc wayqt;
};
}

View File

@@ -0,0 +1,22 @@
{
stdenv
, lib, fetchFromGitLab
, meson, ninja, pkg-config
, qtbase, wrapQtAppsHook
, dfl-ipc
}:
stdenv.mkDerivation {
pname = "dfl-applications";
version = "20221012";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "Applications";
rev = "08b6740379d596f40562b37b509705f5c8af0c42";
sha256 = "1jiymrg6236572yk6rnbl183fisl4kqr5c2zji910n93zv7lqqiv";
};
buildInputs = [ qtbase meson ninja pkg-config dfl-ipc ];
nativeBuildInputs = [ wrapQtAppsHook ];
}

View File

@@ -0,0 +1,21 @@
{
stdenv
, lib, fetchFromGitLab
, meson, ninja, pkg-config
, qtbase, wrapQtAppsHook
}:
stdenv.mkDerivation {
pname = "dfl-ipc";
version = "20221012";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "IPC";
rev = "7370f8da2601a57d85d0989339f6e2fe700f9813";
sha256 = "1iv1kc9i75q56h0zi4fncf0hdf11wjzvjkik14n9nxgbz89w7cyh";
};
buildInputs = [ qtbase meson ninja pkg-config ];
nativeBuildInputs = [ wrapQtAppsHook ];
}

View File

@@ -0,0 +1,21 @@
{
stdenv
, lib, fetchFromGitLab
, meson, ninja, pkg-config
, qtbase, wrapQtAppsHook
}:
stdenv.mkDerivation {
pname = "dfl-utils";
version = "20221026";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "Utils";
rev = "603f95cae18998e9ff8b205c3801699056549505";
sha256 = "0wbiaw6d2n13cpnpnk7089c9jqbwxn0dp9qz4n9cp0ic3z5w0gq4";
};
buildInputs = [ qtbase meson ninja pkg-config ];
nativeBuildInputs = [ wrapQtAppsHook ];
}

View File

@@ -0,0 +1,22 @@
{
stdenv
, lib, fetchFromGitLab
, meson, ninja, pkg-config
, qtbase, wrapQtAppsHook
, wayland, wlroots_0_16
}:
stdenv.mkDerivation {
pname = "wayqt";
version = "20230112";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "wayqt";
rev = "8604391059da1acd5c5b67f44742af10919bb525";
sha256 = "0smbvmgii7f6lsylwg06d7lf83nyiggz8iz7aw3dhf5b8xdhgbaw";
};
buildInputs = [ qtbase wayland wlroots_0_16 meson ninja pkg-config ];
nativeBuildInputs = [ wrapQtAppsHook ];
}

View File

@@ -0,0 +1,19 @@
{ fetchFromGitHub, python, lib, poetry2nix }:
poetry2nix.mkPoetryApplication rec {
inherit python;
src = fetchFromGitHub {
owner = "justfoolingaround";
repo = "animdl";
ref = "9167e03ecb60c21ae1ead90d1472cd7157e1d8b7";
sha256 = "1v33kxlxc38awdpxqsb6bfdw0sc45dibg0b4c0qld0pddlppm0qh";
};
prijectDir = src;
doCheck = false;
meta = with lib; {
inherit (python.meta) platforms;
};
};