diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9baf811..2c0d9e29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: matrix: packages: [ nixos-blur-playmouth, - dexy + picom-allusive ] runs-on: ubuntu-latest steps: diff --git a/flake.lock b/flake.lock index 7dc6db54..69ef47e4 100644 --- a/flake.lock +++ b/flake.lock @@ -429,21 +429,6 @@ "type": "github" } }, - "oldNixpkgs": { - "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "root": { "inputs": { "aagl": "aagl", @@ -453,8 +438,7 @@ "honkai-railway-grub-theme": "honkai-railway-grub-theme", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim", - "oldNixpkgs": "oldNixpkgs" + "nixvim": "nixvim" } }, "systems": { diff --git a/flake.nix b/flake.nix index 22a4b4b9..746ab2f0 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/modules/desktop/submodules/picom.nix b/modules/desktop/submodules/picom.nix index 2c8560bc..c612c93e 100644 --- a/modules/desktop/submodules/picom.nix +++ b/modules/desktop/submodules/picom.nix @@ -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; diff --git a/pkgs/README.md b/pkgs/README.md index 3ef7d8df..60101024 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -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 | diff --git a/pkgs/picom-allusive/default.nix b/pkgs/picom-allusive/default.nix new file mode 100644 index 00000000..0f4de0ad --- /dev/null +++ b/pkgs/picom-allusive/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/sddm/theme/dexy/default.nix b/pkgs/sddm/theme/dexy/default.nix deleted file mode 100644 index d5f9b643..00000000 --- a/pkgs/sddm/theme/dexy/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libsForQt5 -, kdePackages -}: stdenv.mkDerivation { - name = "dexy-sddm-theme"; - - src = fetchFromGitHub { - owner = "L4ki"; - repo = "Dexy-Plasma-Themes"; - rev = "285c928eedecbc438013396292dfd346b73082e7"; - sha256 = "sha256-nx1xNdbbP1slN4Zm/gFg8m8oCLUOnZDZiLOucY2C5d8="; - }; - - dontWrapQtApps = true; - - propagatedUserEnvPkgs = with libsForQt5; [ - plasma-framework - plasma-workspace - kdePackages.sddm - ]; - - installPhase = '' - mkdir -p $out/share/sddm/themes - cp -r ./Dexy-Color-SDDM $out/share/sddm/themes/dexy - ''; - - meta = with lib; { - homepage = "https://github.com/L4ki/Dexy-Plasma-Themes"; - description = "Dexy SDDM Theme create by L4ki"; - license = licenses.gpl3; - maintainers = with maintainers; [ Wittano ]; - platforms = platforms.linux; - }; -}