From aa970620a51824a5361565d16a18882fcf1a3759 Mon Sep 17 00:00:00 2001 From: patka Date: Sun, 19 Jul 2026 13:57:48 +0200 Subject: [PATCH] lightdm-enso-os-greeter: drop --- .../lightdm-greeters/enso-os.nix | 122 ------------------ .../services/x11/display-managers/lightdm.nix | 4 +- .../lightdm-enso-os-greeter/fix-paths.patch | 33 ----- .../li/lightdm-enso-os-greeter/package.nix | 97 -------------- pkgs/top-level/aliases.nix | 1 + 5 files changed, 4 insertions(+), 253 deletions(-) delete mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix delete mode 100644 pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch delete mode 100644 pkgs/by-name/li/lightdm-enso-os-greeter/package.nix diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix deleted file mode 100644 index 977042a074bd..000000000000 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; -let - dmcfg = config.services.xserver.displayManager; - ldmcfg = dmcfg.lightdm; - cfg = ldmcfg.greeters.enso; - - theme = cfg.theme.package; - icons = cfg.iconTheme.package; - cursors = cfg.cursorTheme.package; - - ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" '' - [greeter] - default-wallpaper=${ldmcfg.background} - gtk-theme=${cfg.theme.name} - icon-theme=${cfg.iconTheme.name} - cursor-theme=${cfg.cursorTheme.name} - blur=${toString cfg.blur} - brightness=${toString cfg.brightness} - ${cfg.extraConfig} - ''; -in -{ - options = { - services.xserver.displayManager.lightdm.greeters.enso = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable enso-os-greeter as the lightdm greeter - ''; - }; - - theme = { - package = mkPackageOption pkgs "gnome-themes-extra" { }; - name = mkOption { - type = types.str; - default = "Adwaita"; - description = '' - Name of the theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - iconTheme = { - package = mkPackageOption pkgs "papirus-icon-theme" { }; - name = mkOption { - type = types.str; - default = "ePapirus"; - description = '' - Name of the icon theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - cursorTheme = { - package = mkPackageOption pkgs "capitaine-cursors" { }; - name = mkOption { - type = types.str; - default = "capitane-cursors"; - description = '' - Name of the cursor theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - blur = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable blur - ''; - }; - - brightness = mkOption { - type = types.int; - default = 7; - description = '' - Brightness - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the greeter.conf - configuration file - ''; - }; - }; - }; - - config = mkIf (ldmcfg.enable && cfg.enable) { - environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; - - environment.systemPackages = [ - cursors - icons - theme - ]; - - services.xserver.displayManager.lightdm = { - greeter = mkDefault { - package = pkgs.lightdm-enso-os-greeter.xgreeters; - name = "pantheon-greeter"; - }; - - greeters = { - gtk = { - enable = mkDefault false; - }; - }; - }; - }; -} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 699a9a9a07f3..19e7d2c522bf 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -83,7 +83,6 @@ in imports = [ ./lightdm-greeters/gtk.nix ./lightdm-greeters/mini.nix - ./lightdm-greeters/enso-os.nix ./lightdm-greeters/pantheon.nix ./lightdm-greeters/lomiri.nix ./lightdm-greeters/tiny.nix @@ -107,6 +106,9 @@ in "user" ] ) + (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "lightdm" "greeters" "enso" ] + "services.xserver.displayManager.lightdm.greeters.enso has been removed following removal of the corresponding package." + ) ]; options = { diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch deleted file mode 100644 index 8ddee3abf8d9..000000000000 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt -index 57aebb0..11c4ca7 100644 ---- a/greeter/CMakeLists.txt -+++ b/greeter/CMakeLists.txt -@@ -1,6 +1,6 @@ - project (greeter) --cmake_minimum_required (VERSION 2.8) --cmake_policy (VERSION 2.8) -+cmake_minimum_required (VERSION 3.10) -+cmake_policy (VERSION 3.10) - - enable_testing () - -@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - set (CONF_DIR "/etc/lightdm") - set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") - set (PKGDATADIR "${DATADIR}/enso/greeter") --set (CMAKE_INSTALL_PREFIX /usr) - set (VERSION "1.0.6") - - -@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml) - add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS}) - target_link_libraries(pantheon-greeter m) - --install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin) -+install (TARGETS pantheon-greeter RUNTIME DESTINATION bin) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters) --install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR}) -+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR}) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR}) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR}) diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix deleted file mode 100644 index 91bbedc0e5dd..000000000000 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - linkFarm, - lightdm-enso-os-greeter, - dbus, - pcre, - libepoxy, - libxdmcp, - libx11, - libpthread-stubs, - at-spi2-core, - libxklavier, - libxkbcommon, - gtk3, - vala, - cmake, - libgee, - lightdm, - gdk-pixbuf, - clutter-gtk, - wrapGAppsHook3, - librsvg, -}: - -stdenv.mkDerivation { - pname = "lightdm-enso-os-greeter"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "nick92"; - repo = "Enso-OS"; - rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; - }; - - patches = [ - ./fix-paths.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - dbus - gtk3 - pcre - libepoxy - libgee - libx11 - lightdm - libxdmcp - gdk-pixbuf - clutter-gtk - libxklavier - at-spi2-core - libxkbcommon - libpthread-stubs - librsvg - ]; - - preConfigure = '' - cd greeter - ''; - - passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [ - { - path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop"; - name = "pantheon-greeter.desktop"; - } - ]; - - postFixup = '' - substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \ - --replace "pantheon-greeter" "$out/bin/pantheon-greeter" - ''; - - meta = { - description = '' - A fork of pantheon greeter that positions elements in a central and - vertigal manner and adds a blur effect to the background - ''; - mainProgram = "pantheon-greeter"; - homepage = "https://github.com/nick92/Enso-OS"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - eadwu - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92910ed3e139..345c7b2684eb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1303,6 +1303,7 @@ mapAliases { libXxf86misc = libxxf86misc; # Added 2026-02-06 libXxf86vm = libxxf86vm; # Added 2026-02-06 light = throw "'light' has been removed because it was unmaintained. 'brightnessctl' and 'acpilight' provide similar functionality."; # Added 2026-02-24 + lightdm-enso-os-greeter = throw "'lightdm-enso-os-greeter' has been removed due to being archived upstream"; # Added 2026-07-19 lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27 lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20