Skip to content

Commit

Permalink
feat(picom): added picom-allusive to private repo
Browse files Browse the repository at this point in the history
  • Loading branch information
Wittano committed Jul 7, 2024
1 parent b385e97 commit 4d07cff
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
matrix:
packages: [
nixos-blur-playmouth,
dexy
picom-allusive
]
runs-on: ubuntu-latest
steps:
Expand Down
18 changes: 1 addition & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
};

inputs = {
oldNixpkgs.url = "nixpkgs/nixos-23.11";
nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-24.05";
Expand Down
8 changes: 2 additions & 6 deletions modules/desktop/submodules/picom.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
{ oldPkgs, ... }:
{ pkgs, ... }:
{
config = {
services.picom = {
enable = true;
package = builtins.trace ''
Package picom-allusive is removed in NixOS 24.05 version.
Fix it, after added new animation format
''
oldPkgs.picom-allusive;
package = pkgs.picom-allusive;
backend = "glx";
fade = true;
fadeDelta = 4;
Expand Down
7 changes: 4 additions & 3 deletions pkgs/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Packages
Packages are aviable via standard flake packages or [Nix overlays](https://ryantm.github.io/nixpkgs/using/overlays/):
| Name | Nix package name | Description |
|----------------------------------------------------------------|----------------------|--------------------------------|
| [Nixos-Blur](https://git.gurkan.in/gurkan/nixos-blur-plymouth) | nixos-blur-playmouth | A nice theme for bootscreen :) |
| Name | Nix package name | Description |
|------------------------------------------------------------------|----------------------|-----------------------------------------------------------------|
| [Nixos-Blur](https://git.gurkan.in/gurkan/nixos-blur-plymouth) | nixos-blur-playmouth | A nice theme for bootscreen :) |
| [Picom-Allusive](https://github.com/allusive-dev/picom-allusive) | picom-allusive | A fork of picom featuring improved animations and other feature |
30 changes: 30 additions & 0 deletions pkgs/picom-allusive/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ picom, lib, fetchFromGitHub, installShellFiles, pcre2 }:

picom.overrideAttrs (oldAttrs: rec {
pname = "compfy";
version = "1.7.2";

src = fetchFromGitHub {
owner = "allusive-dev";
repo = "compfy";
rev = version;
hash = "sha256-7hvzwLEG5OpJzsrYa2AaIW8X0CPyOnTLxz+rgWteNYY=";
};

buildInputs = [ pcre2 ] ++ oldAttrs.buildInputs;

nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs;

postInstall = ''
if [ -f "$out/bin/compfy" ]; then
mv "$out/bin/compfy" "$out/bin/picom"
fi
'';

meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // {
description = "A fork of picom featuring improved animations and other features";
homepage = "https://github.com/allusive-dev/picom-allusive";
license = with lib.licenses; [ mit mpl20 ];
maintainers = with lib.maintainers; [ Wittano ];
};
})
36 changes: 0 additions & 36 deletions pkgs/sddm/theme/dexy/default.nix

This file was deleted.

0 comments on commit 4d07cff

Please sign in to comment.