diff --git a/flake.lock b/flake.lock index 959e321..7ff53ab 100644 --- a/flake.lock +++ b/flake.lock @@ -1120,7 +1120,8 @@ "powercord-tiktok-tts": "powercord-tiktok-tts", "sur-cord": "sur-cord", "theme-toggler": "theme-toggler", - "vscodeInsiders": "vscodeInsiders" + "vscodeInsiders": "vscodeInsiders", + "web-greeter": "web-greeter" } }, "rotate-text": { @@ -1285,6 +1286,24 @@ "type": "github" } }, + "web-greeter": { + "flake": false, + "locked": { + "lastModified": 1657694511, + "narHash": "sha256-JP31uYsBLM6htfYedy4x4bQzUcx5GOsURLeilqF133c=", + "ref": "master", + "rev": "9240129793e19c34d166071ce1b3d55b5d033d74", + "revCount": 819, + "submodules": true, + "type": "git", + "url": "https://github.com/JezerM/web-greeter" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/JezerM/web-greeter" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 981698f..73f8a7a 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,13 @@ url = "github:redstonekasi/theme-toggler"; flake = false; }; + + web-greeter = { + type = "git"; + url = "https://github.com/JezerM/web-greeter"; + submodules = true; + flake = false; + }; }; outputs = { diff --git a/home/default.nix b/home/default.nix index 8b9bccf..526f922 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,6 +10,8 @@ inputs.nix-doom-emacs.hmModule ]; home.packages = with pkgs; [ + web-greeter + acpi alejandra android-tools diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 923ed30..c86040a 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -187,7 +187,7 @@ "sha256": "sha256-C0h9SsupYIg5vrtthKtRMh8JVB3CRoBd1+vXkUXxHd8=", "type": "github" }, - "version": "755c10a8894790be280bbccc508a4a9c5af56adb" + "version": "54e006038c28092aa8b2cc88fad139a8edb3ce6c" }, "zscroll": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 88b02cf..44e057f 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -111,7 +111,7 @@ repo = "spicetify-themes"; rev = "755c10a8894790be280bbccc508a4a9c5af56adb"; fetchSubmodules = false; - sha256 = "sha256-C0h9SsupYIg5vrtthKtRMh8JVB3CRoBd1+vXkUXxHd8="; + sha256 = "sha256-vK5496rGwgCxKjVO8V7CYkXigpKRonidmwWXMOrMN3I="; }; }; zscroll = { diff --git a/pkgs/default.nix b/pkgs/default.nix index f3dac9e..85f3e0c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -final: prev: let +inputs: final: prev: let sources = prev.callPackage ./_sources/generated.nix {}; in { spicetify-cli = with prev; @@ -32,6 +32,10 @@ in { inherit (sources.coc-tailwindcss3) src pname version; }; + web-greeter = final.callPackage ./web-greeter.nix { + web-greeter-src = inputs.web-greeter; + }; + awesome = (prev.awesome.overrideAttrs (old: { inherit (sources.awesome) src pname version; diff --git a/pkgs/web-greeter.nix b/pkgs/web-greeter.nix new file mode 100644 index 0000000..64199d9 --- /dev/null +++ b/pkgs/web-greeter.nix @@ -0,0 +1,31 @@ +{ stdenv +, web-greeter-src +, nodejs +, rsync +, pkg-config +, python3Packages +, gobject-introspection +, lightdm +, xorg +, libsForQt5 +, callPackage +, +}: +stdenv.mkDerivation { + pname = "web-greeter"; + version = web-greeter-src.rev; + src = web-greeter-src; + dontWrapQtApps = true; + nativeBuildInputs = [ nodejs rsync pkg-config python3Packages.pyqt5 ]; + buildInputs = with python3Packages; [ lightdm pygobject3 pyqt5 pyqtwebengine ruamel_yaml pyinotify gobject-introspection xorg.libX11 libsForQt5.qtwebengine ]; + __noChroot = true; + buildPhase = '' + HOME=$(mktemp -d) + # fuck it + npm exec --package=typescript -- make + ''; + installPhase = '' + make install + ''; + DESTDIR = placeholder "out"; +} diff --git a/sys/generic.nix b/sys/generic.nix index 4cd8300..55ea447 100644 --- a/sys/generic.nix +++ b/sys/generic.nix @@ -44,7 +44,7 @@ in { inputs.neovim-nightly-overlay.overlay inputs.fenix.overlay inputs.nixpkgs-wayland.overlay - (import ../pkgs) + (import ../pkgs inputs) ]; environment.systemPackages = with pkgs; [