core: add a greetd login backend

CMakeLists.txt

@@ -72,6 +72,7 @@ find_package(Threads REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(OpenGL REQUIRED COMPONENTS EGL GLES3)
 find_package(hyprwayland-scanner 0.4.4 REQUIRED)
+find_package(glaze REQUIRED)
 pkg_check_modules(
   deps
   REQUIRED
@@ -86,15 +87,27 @@ pkg_check_modules(
   pangocairo
   libdrm
   gbm
-  pam
-  hyprutils>=0.8.0
+  hyprutils>=0.11.0
   sdbus-c++>=2.0.0
-  hyprgraphics)
+  hyprgraphics>=0.1.6)
+find_library(PAM_FOUND NAMES pam libpam)
+if(PAM_FOUND)
+  set(PAM_LIB ${PAM_FOUND})
+else()
+  pkg_check_modules(PAM IMPORTED_TARGET pam libpam)
+  if(PAM_FOUND)
+    set(PAM_LIB PkgConfig::PAM)
+  else()
+    message(FATAL_ERROR "The required library libpam was not found.")
+  endif()
+endif()
+
+message(STATUS "Found pam at ${PAM_LIB}")
 
 file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 add_executable(hyprlock ${SRCFILES})
-target_link_libraries(hyprlock PRIVATE pam rt Threads::Threads PkgConfig::deps
-                                       OpenGL::EGL OpenGL::GLES3)
+target_link_libraries(hyprlock PRIVATE ${PAM_LIB} rt Threads::Threads PkgConfig::deps
+                                       OpenGL::EGL OpenGL::GLES3 glaze::glaze)
 
 # protocols
 pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
@@ -129,7 +142,7 @@ function(protocolWayland)
 endfunction()
 
 make_directory(${CMAKE_SOURCE_DIR}/protocols) # we don't ship any custom ones so
-                                              # the dir won't be there
+# the dir won't be there
 
 protocolwayland()
 

README.md

@@ -32,7 +32,6 @@ You need the following dependencies
 
 - cairo
 - hyprgraphics
-- hyprland-protocols
 - hyprlang
 - hyprutils
 - hyprwayland-scanner

VERSION

@@ -1 +1 @@
-0.8.2
+0.9.3

assets/example.conf

@@ -57,6 +57,9 @@ input-field {
     placeholder_text = Input password...
     fail_text = $PAMFAIL
 
+    # uncomment if you wish to display a message during authentication
+    # check_text = Authenticating...
+
     # uncomment to use a letter instead of a dot to indicate the typed password
     # dots_text_format = *
     # dots_size = 0.4

flake.nix

@@ -32,34 +32,39 @@
     };
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    systems,
-    ...
-  } @ inputs: let
-    inherit (nixpkgs) lib;
-    eachSystem = lib.genAttrs (import systems);
-    pkgsFor = eachSystem (system:
-      import nixpkgs {
-        localSystem.system = system;
-        overlays = with self.overlays; [default];
-      });
-  in {
-    overlays = import ./nix/overlays.nix {inherit inputs lib self;};
+  outputs =
+    {
+      self,
+      nixpkgs,
+      systems,
+      ...
+    }@inputs:
+    let
+      inherit (nixpkgs) lib;
+      eachSystem = lib.genAttrs (import systems);
+      pkgsFor = eachSystem (
+        system:
+        import nixpkgs {
+          localSystem.system = system;
+          overlays = with self.overlays; [ hyprlock-with-deps ];
+        }
+      );
+    in
+    {
+      overlays = import ./nix/overlays.nix { inherit inputs lib self; };
 
-    packages = eachSystem (system: {
-      default = self.packages.${system}.hyprlock;
-      inherit (pkgsFor.${system}) hyprlock;
-    });
+      packages = eachSystem (system: {
+        default = self.packages.${system}.hyprlock;
+        inherit (pkgsFor.${system}) hyprlock;
+      });
 
-    homeManagerModules = {
-      default = self.homeManagerModules.hyprlock;
-      hyprlock = builtins.throw "hyprlock: the flake HM module has been removed. Use the module from Home Manager upstream.";
-    };
+      homeManagerModules = {
+        default = self.homeManagerModules.hyprlock;
+        hyprlock = builtins.throw "hyprlock: the flake HM module has been removed. Use the module from Home Manager upstream.";
+      };
 
-    checks = eachSystem (system: self.packages.${system});
+      checks = eachSystem (system: self.packages.${system});
 
-    formatter = eachSystem (system: pkgsFor.${system}.alejandra);
-  };
+      formatter = eachSystem (system: pkgsFor.${system}.nixfmt-tree);
+    };
 }

nix/default.nix

@@ -2,8 +2,9 @@
   lib,
   stdenv,
   cmake,
-  pkg-config,
   cairo,
+  glaze,
+  pkg-config,
   libdrm,
   libGL,
   libxkbcommon,
@@ -14,7 +15,7 @@
   hyprwayland-scanner,
   pam,
   pango,
-  sdbus-cpp,
+  sdbus-cpp_2,
   systemdLibs,
   wayland,
   wayland-protocols,
@@ -37,6 +38,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     cairo
+    glaze
     libdrm
     libGL
     libxkbcommon
@@ -46,7 +48,7 @@ stdenv.mkDerivation {
     hyprutils
     pam
     pango
-    sdbus-cpp
+    sdbus-cpp_2
     systemdLibs
     wayland
     wayland-protocols

nix/overlays.nix

@@ -2,43 +2,46 @@
   lib,
   inputs,
   self,
-}: let
-  mkDate = longDate: (lib.concatStringsSep "-" [
-    (builtins.substring 0 4 longDate)
-    (builtins.substring 4 2 longDate)
-    (builtins.substring 6 2 longDate)
-  ]);
+}:
+let
+  mkDate =
+    longDate:
+    (lib.concatStringsSep "-" [
+      (builtins.substring 0 4 longDate)
+      (builtins.substring 4 2 longDate)
+      (builtins.substring 6 2 longDate)
+    ]);
 
   version = lib.removeSuffix "\n" (builtins.readFile ../VERSION);
-in {
+in
+{
   default = inputs.self.overlays.hyprlock;
 
-  hyprlock = lib.composeManyExtensions [
+  hyprlock-with-deps = lib.composeManyExtensions [
     inputs.hyprgraphics.overlays.default
     inputs.hyprlang.overlays.default
     inputs.hyprutils.overlays.default
     inputs.hyprwayland-scanner.overlays.default
-    inputs.self.overlays.sdbuscpp
-    (final: prev: {
-      hyprlock = prev.callPackage ./default.nix {
-        stdenv = prev.gcc15Stdenv;
-        version = version + "+date=" + (mkDate (inputs.self.lastModifiedDate or "19700101")) + "_" + (inputs.self.shortRev or "dirty");
-        inherit (final) hyprlang;
-        shortRev = self.sourceInfo.shortRev or "dirty";
-      };
-    })
+    self.overlays.hyprlock
+    self.overlays.glaze
   ];
 
-  sdbuscpp = final: prev: {
-    sdbus-cpp = prev.sdbus-cpp.overrideAttrs (self: super: {
-      version = "2.0.0";
-
-      src = final.fetchFromGitHub {
-        owner = "Kistler-group";
-        repo = "sdbus-cpp";
-        rev = "refs/tags/v${self.version}";
-        hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
-      };
+  glaze = final: prev: {
+    glaze = prev.glaze.overrideAttrs (self: super: {
+      cmakeFlags = super.cmakeFlags ++ ["-Dglaze_ENABLE_SSL=OFF"];
     });
   };
+
+  hyprlock = final: prev: {
+    hyprlock = prev.callPackage ./default.nix {
+      stdenv = prev.gcc15Stdenv;
+      version =
+        version
+        + "+date="
+        + (mkDate (inputs.self.lastModifiedDate or "19700101"))
+        + "_"
+        + (inputs.self.shortRev or "dirty");
+      shortRev = self.sourceInfo.shortRev or "dirty";
+    };
+  };
 }

src/auth/Auth.cpp

@@ -1,20 +1,26 @@
 #include "Auth.hpp"
-#include "Pam.hpp"
-#include "Fingerprint.hpp"
 #include "../config/ConfigManager.hpp"
 #include "../core/hyprlock.hpp"
+#include "Fingerprint.hpp"
+#include "GreetdLogin.hpp"
+#include "Pam.hpp"
 #include "src/helpers/Log.hpp"
 
 #include <hyprlang.hpp>
 #include <memory>
 
-CAuth::CAuth() {
-    static const auto ENABLEPAM = g_pConfigManager->getValue<Hyprlang::INT>("auth:pam:enabled");
-    if (*ENABLEPAM)
-        m_vImpls.emplace_back(makeShared<CPam>());
+CAuth::CAuth(bool sessionLogin) {
+    static const auto ENABLEPAM         = g_pConfigManager->getValue<Hyprlang::INT>("auth:pam:enabled");
     static const auto ENABLEFINGERPRINT = g_pConfigManager->getValue<Hyprlang::INT>("auth:fingerprint:enabled");
-    if (*ENABLEFINGERPRINT)
-        m_vImpls.emplace_back(makeShared<CFingerprint>());
+
+    if (sessionLogin)
+        m_vImpls.emplace_back(makeShared<CGreetdLogin>());
+    else {
+        if (*ENABLEPAM)
+            m_vImpls.emplace_back(makeShared<CPam>());
+        if (*ENABLEFINGERPRINT)
+            m_vImpls.emplace_back(makeShared<CFingerprint>());
+    }
 
     RASSERT(!m_vImpls.empty(), "At least one authentication method must be enabled!");
 }
@@ -106,7 +112,7 @@ void CAuth::enqueueFail(const std::string& failText, eAuthImplementations implTy
     m_sCurrentFail.failSource = implType;
     m_sCurrentFail.failedAttempts++;
 
-    Debug::log(LOG, "Failed attempts: {}", m_sCurrentFail.failedAttempts);
+    Log::logger->log(Log::INFO, "Failed attempts: {}", m_sCurrentFail.failedAttempts);
 
     if (m_resetDisplayFailTimer) {
         m_resetDisplayFailTimer->cancel();

src/auth/Auth.hpp

@@ -9,6 +9,7 @@
 enum eAuthImplementations {
     AUTH_IMPL_PAM         = 0,
     AUTH_IMPL_FINGERPRINT = 1,
+    AUTH_IMPL_GREETD      = 2,
 };
 
 class IAuthImplementation {
@@ -28,7 +29,7 @@ class IAuthImplementation {
 
 class CAuth {
   public:
-    CAuth();
+    CAuth(bool sessionLogin);
 
     void                       start();