diff options
| author | Freya Murphy <freya@freyacat.org> | 2025-06-27 22:06:00 -0400 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2025-06-27 22:06:00 -0400 |
| commit | fde33e02a35e86d9e5b8f98126bdc7471a047fca (patch) | |
| tree | b7bb829e5be5075640bfa8b5d9375cffc6da1b93 | |
| parent | astal systemd user service (diff) | |
| download | dotfiles-nix-fde33e02a35e86d9e5b8f98126bdc7471a047fca.tar.gz dotfiles-nix-fde33e02a35e86d9e5b8f98126bdc7471a047fca.tar.bz2 dotfiles-nix-fde33e02a35e86d9e5b8f98126bdc7471a047fca.zip | |
update commits
| -rw-r--r-- | flake.lock | 44 | ||||
| -rw-r--r-- | pkgs/astal/builder.nix | 69 | ||||
| -rw-r--r-- | pkgs/astal/default.nix | 3 |
3 files changed, 93 insertions, 23 deletions
@@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1750698959, - "narHash": "sha256-8P21Czb4goeBIyo3U/kpRNerDZ+VxE8J2jiGYOPlGmk=", + "lastModified": 1751041261, + "narHash": "sha256-K1UrMGJLmArrpJaX9G77NA9yApiAZYz2CbqmC0uq6gc=", "owner": "aylur", "repo": "astal", - "rev": "36f1dafe8f298a275c20032c37bd135aa955e4ba", + "rev": "95c6d6dbaf0eaa71a17abf02c20bfca7371956c1", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1750730235, - "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1750681989, - "narHash": "sha256-uxIwiV1p2SVNIoP+oD025lZKfq4zNn7CmdaYVoskqnQ=", + "lastModified": 1751032612, + "narHash": "sha256-GHPKg2q1B/1FKYnEbKp6lgZ8fbHewtO2BAB0fM1hh50=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "cf7e3aa448f8c9e0d9e8f407e6ed730da55acc69", + "rev": "a01d20cfe83aaa518ae0e02b4c8b2225f1324bf3", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1750682153, - "narHash": "sha256-ZA00aPfBtrSTz6UsZ6uoBfy2UYi49A9XpxxyKUjbQ2A=", + "lastModified": 1750958785, + "narHash": "sha256-z6SyE2jxpLqW7zJGl5bgH5zTWPv6vhVZaSHx/JW6Faw=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "132e610b6526820fa1bcf33588be11538fb92ca7", + "rev": "dd28351a6181c37553cca1ce437f0049dcd3ee5f", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1750371096, - "narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=", + "lastModified": 1750703126, + "narHash": "sha256-zJHmLsiW6P8h9HaH5eMKhEh/gvym3k6/Ywr4UHKpJfc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "38f3a211657ce82a1123bf19402199b67a410f08", + "rev": "d46bd32da554c370f98180a1e465f052b9584805", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -754,11 +754,11 @@ ] }, "locked": { - "lastModified": 1750463722, - "narHash": "sha256-IAUpW8WU3ufnIVtNLVKRoNwTUUOBrp6LE7erXhxXOVY=", + "lastModified": 1751074937, + "narHash": "sha256-ppb0GBJ59q3aYT3i/gE5GCDjxBrff+HlX//eQT7Zda4=", "ref": "refs/heads/main", - "rev": "e8163b710d050fa6e7a7eaa2edf452bc057b12be", - "revCount": 79, + "rev": "213f4eb34634bc13a06cc3a90bc40599b231a113", + "revCount": 83, "type": "git", "url": "https://g.trimill.xyz/talc" }, diff --git a/pkgs/astal/builder.nix b/pkgs/astal/builder.nix new file mode 100644 index 0000000..a78d602 --- /dev/null +++ b/pkgs/astal/builder.nix @@ -0,0 +1,69 @@ +{ + pkgs, + astal, + name, + src, + extraLuaPackages ? (ps: []), + extraPackages ? [], +}: let + lua = pkgs.lua.withPackages (ps: + (extraLuaPackages ps) + ++ [ + ps.lgi + (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation { + name = "astal"; + src = "${astal}/lang/lua/astal"; + dontBuild = true; + installPhase = '' + mkdir -p $out/share/lua/${ps.lua.luaversion}/astal + cp -r * $out/share/lua/${ps.lua.luaversion}/astal + ''; + })) + (ps.luaPackages.toLuaModule (pkgs.stdenvNoCC.mkDerivation { + inherit src name; + dontBuild = true; + installPhase = '' + mkdir -p $out/share/lua/${ps.lua.luaversion} + cp -r * $out/share/lua/${ps.lua.luaversion} + ''; + })) + ]); + + script = '' + #!${lua}/bin/lua + require "init" + ''; +in + pkgs.stdenvNoCC.mkDerivation { + inherit src name; + + nativeBuildInputs = with pkgs; [ + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = + extraPackages + ++ [ + lua + astal.packages.${pkgs.system}.io + astal.packages.${pkgs.system}.astal3 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r * $out/bin + echo '${script}' > astal-lua + install -m 755 astal-lua $out/bin/${name} + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${pkgs.lib.makeBinPath extraPackages}" + ) + ''; + } diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix index fb320ee..bc372f1 100644 --- a/pkgs/astal/default.nix +++ b/pkgs/astal/default.nix @@ -13,13 +13,14 @@ theme = import ./theme.nix {inherit options;}; mkAstal = file: - inputs.astal.lib.mkLuaPackage { + import ./builder.nix { pkgs = pkgs // { # use luajit lua = pkgs.luajit; }; + astal = inputs.astal; src = runCommand "src" {} '' mkdir -p $out cp -r ${./src}/{*.lua,widget} $out/ |