From 3931514d408ad5cd1269ced6d158cb625a2e7277 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 12:51:43 -0300 Subject: [PATCH 01/46] Update default.nix --- default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/default.nix b/default.nix index 814c6dd..eaf3708 100644 --- a/default.nix +++ b/default.nix @@ -67,6 +67,13 @@ stdenv.mkDerivation (f: { xorgserver ]; + postFixup = '' + wrapProgram $out/bin/some-script \ + --set PATH ${lib.makeBinPath [ + python3Packages.pygobject3 + ]} + ''; + postInstall = '' sed -i "s|/usr/bin/metacity|${gnome.metacity}/bin/metacity|" $out/bin/compiz-decorator sed -i "s|/usr/bin/compiz-decorator|$out/bin/compiz-decorator|" $out/share/compiz/decor.xml From 1e6fa29f61598bbc4f973fced67bf442de1d5501 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 12:58:47 -0300 Subject: [PATCH 02/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index eaf3708..2bfe011 100644 --- a/default.nix +++ b/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (f: { ]; postFixup = '' - wrapProgram $out/bin/some-script \ + wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ python3Packages.pygobject3 ]} From dc552d4af03e274aed1e9283ad2509a23b31fd06 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 13:02:25 -0300 Subject: [PATCH 03/46] Update default.nix --- default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index 2bfe011..a2c2039 100644 --- a/default.nix +++ b/default.nix @@ -67,12 +67,13 @@ stdenv.mkDerivation (f: { xorgserver ]; - postFixup = '' - wrapProgram $out/bin/ccsm \ - --set PATH ${lib.makeBinPath [ - python3Packages.pygobject3 - ]} - ''; + postFixup = false #'' +# wrapProgram $out/bin/ccsm \ +# --set PATH ${lib.makeBinPath [ +# python3Packages.pygobject3 + # ]} +# '' +; postInstall = '' sed -i "s|/usr/bin/metacity|${gnome.metacity}/bin/metacity|" $out/bin/compiz-decorator From 631a0901e00f63abcb8d3ea9b1316120a89dfcd2 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 13:05:41 -0300 Subject: [PATCH 04/46] Update default.nix --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index a2c2039..6d54fbc 100644 --- a/default.nix +++ b/default.nix @@ -67,12 +67,12 @@ stdenv.mkDerivation (f: { xorgserver ]; - postFixup = false #'' + postFixup = '' False # wrapProgram $out/bin/ccsm \ # --set PATH ${lib.makeBinPath [ # python3Packages.pygobject3 # ]} -# '' + '' ; postInstall = '' From a02591105a972c950e8bc38353f3dbac2902d4f4 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 13:07:34 -0300 Subject: [PATCH 05/46] tries to fix ccsm --- default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 6d54fbc..71cfc93 100644 --- a/default.nix +++ b/default.nix @@ -67,13 +67,6 @@ stdenv.mkDerivation (f: { xorgserver ]; - postFixup = '' False -# wrapProgram $out/bin/ccsm \ -# --set PATH ${lib.makeBinPath [ -# python3Packages.pygobject3 - # ]} - '' -; postInstall = '' sed -i "s|/usr/bin/metacity|${gnome.metacity}/bin/metacity|" $out/bin/compiz-decorator @@ -81,6 +74,11 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/compiz \ --suffix LD_LIBRARY_PATH : "$out/lib" \ --suffix COMPIZ_BIN_PATH : "$out/bin/" + + wrapProgram $out/bin/ccsm \ + --set PATH ${lib.makeBinPath [ + python3Packages.pygobject3 + ]} ''; patches = [ From 23b5c174802145612698ed601903178ced6be129 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:00:14 -0300 Subject: [PATCH 06/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 71cfc93..908a0aa 100644 --- a/default.nix +++ b/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ - python3Packages.pygobject3 + pkgs.python3.withPackages(pp: [pp.pygobject3]) ]} ''; From a511a289f6700238dadcff891253e3527e4f6611 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:00:59 -0300 Subject: [PATCH 07/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 908a0aa..4c98f54 100644 --- a/default.nix +++ b/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ - pkgs.python3.withPackages(pp: [pp.pygobject3]) + python3.withPackages(pp: [pp.pygobject3]) ]} ''; From 712262b86e7606e9a065fbdb489d819738ce29fc Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:03:51 -0300 Subject: [PATCH 08/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 4c98f54..153316e 100644 --- a/default.nix +++ b/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ - python3.withPackages(pp: [pp.pygobject3]) + # python3.withPackages(pp: [pp.pygobject3]) ]} ''; From 024a0e3f8ee0bd76b0a8b57b3bfaade7e320a94a Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:04:37 -0300 Subject: [PATCH 09/46] Update default.nix can the nix caching go fuck itself? --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 153316e..4c98f54 100644 --- a/default.nix +++ b/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ - # python3.withPackages(pp: [pp.pygobject3]) + python3.withPackages(pp: [pp.pygobject3]) ]} ''; From 4cfa5ba76ec2bc0dd782a79ddf9c35147acbc764 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:10:37 -0300 Subject: [PATCH 10/46] Update default.nix --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 4c98f54..7dcbf58 100644 --- a/default.nix +++ b/default.nix @@ -19,6 +19,7 @@ mesa_glu, pcre2, protobuf, + python3, python3Packages, xorg, xorgserver, From 1dc28e29d1511c9c09eed62a11c285afba54dbff Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:11:58 -0300 Subject: [PATCH 11/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 7dcbf58..d162f58 100644 --- a/default.nix +++ b/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/ccsm \ --set PATH ${lib.makeBinPath [ - python3.withPackages(pp: [pp.pygobject3]) + (python3.withPackages(pp: [pp.pygobject3])) ]} ''; From b3a5a22e30652b23af7ef7cc095aaf69d68425be Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:15:36 -0300 Subject: [PATCH 12/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index d162f58..a5475a0 100644 --- a/default.nix +++ b/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (f: { --suffix LD_LIBRARY_PATH : "$out/lib" \ --suffix COMPIZ_BIN_PATH : "$out/bin/" - wrapProgram $out/bin/ccsm \ + wrapProgram $out/bin/* \ --set PATH ${lib.makeBinPath [ (python3.withPackages(pp: [pp.pygobject3])) ]} From 53b14d52b06ae52d4ed167c970beb43ffeac248a Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 18:21:49 -0300 Subject: [PATCH 13/46] Update default.nix --- default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index a5475a0..887bcc8 100644 --- a/default.nix +++ b/default.nix @@ -75,11 +75,13 @@ stdenv.mkDerivation (f: { wrapProgram $out/bin/compiz \ --suffix LD_LIBRARY_PATH : "$out/lib" \ --suffix COMPIZ_BIN_PATH : "$out/bin/" - - wrapProgram $out/bin/* \ - --set PATH ${lib.makeBinPath [ - (python3.withPackages(pp: [pp.pygobject3])) - ]} + for i in $out/bin/* + do + wrapProgram $i \ + --set PATH ${lib.makeBinPath [ + (python3.withPackages(pp: [pp.pygobject3])) + ]} + done ''; patches = [ From e9d74aa07e2bb0255c8701eec8635fb04df90968 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 13 May 2024 19:18:48 -0300 Subject: [PATCH 14/46] Update default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 887bcc8..d661dcf 100644 --- a/default.nix +++ b/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (f: { pcre2.dev libxml2.dev ]; - buildInputs = [ + propagatedBuildInputs = [ boost cairo fuse From b6bef332728b88d6c57ae5ad64d4a2b1ef67ae10 Mon Sep 17 00:00:00 2001 From: Luana Date: Wed, 22 May 2024 21:06:00 -0300 Subject: [PATCH 15/46] Merge from Gab's repo Merge fix from https://github.com/Misterio77/nix-config/commit/7f270e1c010aaaf8b90565bf494c932faed0df8a --- default.nix | 79 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/default.nix b/default.nix index d661dcf..dd9da77 100644 --- a/default.nix +++ b/default.nix @@ -1,26 +1,28 @@ { - stdenv, - fetchurl, lib, - cmake, - pkg-config, - makeWrapper, boost, cairo, + cmake, + fetchurl, fuse, glibmm, gnome, + gobject-introspection, + gtk3, intltool, libnotify, libstartup_notification, libwnck3, libxml2, libxslt, + makeWrapper, mesa_glu, pcre2, + pkg-config, protobuf, - python3, python3Packages, + stdenv, + wrapGAppsHook3, xorg, xorgserver, ... @@ -36,18 +38,23 @@ stdenv.mkDerivation (f: { nativeBuildInputs = [ cmake - pkg-config + libxml2 makeWrapper - xorg.libXdmcp.dev - pcre2.dev - libxml2.dev + pcre2 + pkg-config + python3Packages.cython + python3Packages.setuptools + python3Packages.wrapPython + wrapGAppsHook3 ]; - propagatedBuildInputs = [ + buildInputs = [ boost cairo fuse glibmm gnome.metacity + gobject-introspection + gtk3 intltool libnotify libstartup_notification @@ -56,40 +63,44 @@ stdenv.mkDerivation (f: { libxslt mesa_glu pcre2 - pcre2.dev protobuf - python3Packages.cython - python3Packages.pycairo - python3Packages.pygobject3 - python3Packages.setuptools xorg.libXcursor xorg.libXdmcp - xorg.libXdmcp.dev xorgserver ]; - postInstall = '' - sed -i "s|/usr/bin/metacity|${gnome.metacity}/bin/metacity|" $out/bin/compiz-decorator + sed -i "s|/usr/bin/metacity|metacity|" $out/bin/compiz-decorator sed -i "s|/usr/bin/compiz-decorator|$out/bin/compiz-decorator|" $out/share/compiz/decor.xml - wrapProgram $out/bin/compiz \ - --suffix LD_LIBRARY_PATH : "$out/lib" \ - --suffix COMPIZ_BIN_PATH : "$out/bin/" - for i in $out/bin/* - do - wrapProgram $i \ - --set PATH ${lib.makeBinPath [ - (python3.withPackages(pp: [pp.pygobject3])) - ]} - done + ''; + + dontWrapGApps = true; + + pythonPath = with python3Packages; [ + pycairo + pygobject3 + ]; + + postFixup = '' + wrapProgram "$out/bin/compiz" \ + --prefix COMPIZ_BIN_PATH : "$out/bin/" \ + --prefix LD_LIBRARY_PATH : "$out/lib" + + wrapProgram "$out/bin/compiz-decorator" \ + --prefix COMPIZ_BIN_PATH : "$out/bin/" \ + --prefix PATH : "${gnome.metacity}/bin" + + # Wrap CCSM with GApps and Python path + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapPythonPrograms ''; patches = [ - ./patches/reverse-unity-config.patch - ./patches/focus-prevention-disable.patch - ./patches/gtk-extents.patch - ./patches/screenshot-launch-fix.patch - ./patches/no-compile-gschemas.patch + ./reverse-unity-config.patch + ./focus-prevention-disable.patch + ./gtk-extents.patch + ./screenshot-launch-fix.patch + ./no-compile-gschemas.patch ]; cmakeFlags = [ From 526a76c4786ad8f23b8fc3a124b1b9d7bf4ca2e3 Mon Sep 17 00:00:00 2001 From: Luana Date: Wed, 22 May 2024 21:07:18 -0300 Subject: [PATCH 16/46] Update default.nix --- default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index dd9da77..a5b2648 100644 --- a/default.nix +++ b/default.nix @@ -96,11 +96,11 @@ stdenv.mkDerivation (f: { ''; patches = [ - ./reverse-unity-config.patch - ./focus-prevention-disable.patch - ./gtk-extents.patch - ./screenshot-launch-fix.patch - ./no-compile-gschemas.patch + ./patches/reverse-unity-config.patch + ./patches/focus-prevention-disable.patch + ./patches/gtk-extents.patch + ./patches/screenshot-launch-fix.patch + ./patches/no-compile-gschemas.patch ]; cmakeFlags = [ From ffa4610a222e01a6b0077d0d9bcc3ce6fe00418c Mon Sep 17 00:00:00 2001 From: Luana Date: Wed, 22 May 2024 21:26:59 -0300 Subject: [PATCH 17/46] fix broken decorator Create compiz-suse-defaults.patch --- patches/compiz-suse-defaults.patch | 96 ++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 patches/compiz-suse-defaults.patch diff --git a/patches/compiz-suse-defaults.patch b/patches/compiz-suse-defaults.patch new file mode 100644 index 0000000..e7f0a2e --- /dev/null +++ b/patches/compiz-suse-defaults.patch @@ -0,0 +1,96 @@ +--- a/metadata/core.xml.in ++++ b/metadata/core.xml.in +@@ -13,7 +13,7 @@ + + +--- a/plugins/cube/cube.xml.in ++++ b/plugins/cube/cube.xml.in +@@ -123,18 +123,18 @@ + <_short>Skydome Gradient Start Color + <_long>Color and opacity to use for the top color-stop of the skydome-fallback gradient. + +- 0x0d0d +- 0xb1b1 +- 0xfdfd ++ 0xafaf ++ 0xafaf ++ 0xafaf + + + + +@@ -144,7 +144,7 @@ + + + +--- a/plugins/decor/decor.xml.in ++++ b/plugins/decor/decor.xml.in +@@ -23,7 +23,7 @@ + + - -@@ -168,7 +168,7 @@ - - - -- animation:Zoom -+ animation:Magic Lamp - - - - - - -@@ -473,7 +473,7 @@ - - - -@@ -205,7 +205,6 @@ - - - -diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in ---- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000 -+++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000 -@@ -31,7 +31,7 @@ - -diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in ---- original/plugins/fade/fade.xml.in 2019-02-16 12:44:41.000000000 +0000 -+++ modified/plugins/fade/fade.xml.in 2019-02-17 14:11:58.772752647 +0000 -@@ -10,7 +10,6 @@ - - - decor -- staticswitcher - - - cube -@@ -51,7 +50,7 @@ - - - - -diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in ---- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000 -+++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000 -@@ -68,12 +68,12 @@ - - - - -@@ -82,10 +82,10 @@ - <_short>Fill Color - <_long>Fill color used for rectangle resize mode - -- 0xfbfb -- 0x8b8b -- 0x0 -- 0x1919 -+ 0x2f2f -+ 0x2f2f -+ 0x4f4f -+ 0x4f4f - - - -@@ -46,7 +46,7 @@ - -@@ -76,7 +76,7 @@ - <_long>Overlay an icon on windows once they are scaled - 0 - 2 -- 0 -+ 1 - - 0 - <_name>None -@@ -129,7 +129,7 @@ - <_long>Selects where windows are scaled if multiple output devices are used. - 0 - 1 -- 1 -+ 0 - - 0 - <_name>On current output device -@@ -150,7 +150,7 @@ - - - - - - - - -@@ -160,14 +161,14 @@ - - -@@ -191,7 +192,7 @@ - - - <_short>Selected Window Highlight - - -@@ -78,30 +78,30 @@ - <_short>Base Color - <_long>First color for the background gradient of the switcher window. - -- 0x0000 -- 0x0000 -- 0x0000 -- 0x6464 -+ 0xcccc -+ 0xcccc -+ 0xe665 -+ 0xd998 - - - - - -@@ -112,20 +112,20 @@ - <_short>Base Color - <_long>First color for the thumb gradient of the switcher window. - -- 0x5555 -- 0x5555 -- 0x5555 -- 0x3232 -+ 0x3333 -+ 0x3333 -+ 0x3333 -+ 0x5999 - - - - -@@ -139,7 +139,7 @@ - 0xffff - 0xffff - 0xffff -- 0xffff -+ 0xf332 - - - - -@@ -201,7 +201,7 @@ - - - -@@ -356,7 +356,7 @@ - - + +@@ -179,7 +179,7 @@ + + + + + + + +diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in +--- original/plugins/animation/animation.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/animation/animation.xml.in 2019-02-17 14:11:58.766082647 +0000 +@@ -36,7 +36,7 @@ + + + +- animation:Glide 2 ++ animation:Zoom + animation:Fade + animation:Fade + +@@ -48,9 +48,9 @@ + 50 + 4000 + +- 120 +- 80 +- 80 ++ 200 ++ 150 ++ 150 + + + +@@ -102,7 +102,7 @@ + + + +- animation:Glide 2 ++ animation:Zoom + animation:Fade + animation:Fade + +@@ -114,9 +114,9 @@ + 50 + 4000 + +- 120 +- 80 +- 50 ++ 200 ++ 150 ++ 150 + + + +@@ -168,7 +168,7 @@ + + + +- animation:Zoom ++ animation:Magic Lamp + + + + + + +@@ -473,7 +473,7 @@ + + + +@@ -205,7 +205,6 @@ + + + +diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in +--- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000 +@@ -31,7 +31,7 @@ + + + + +@@ -26,7 +25,7 @@ + + + + + +diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in +--- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000 +@@ -68,12 +68,12 @@ + + + + +@@ -82,10 +82,10 @@ + <_short>Fill Color + <_long>Fill color used for rectangle resize mode + +- 0xfbfb +- 0x8b8b +- 0x0 +- 0x1919 ++ 0x2f2f ++ 0x2f2f ++ 0x4f4f ++ 0x4f4f + + + +@@ -46,7 +46,7 @@ + +@@ -76,7 +76,7 @@ + <_long>Overlay an icon on windows once they are scaled + 0 + 2 +- 0 ++ 1 + + 0 + <_name>None +@@ -129,7 +129,7 @@ + <_long>Selects where windows are scaled if multiple output devices are used. + 0 + 1 +- 1 ++ 0 + + 0 + <_name>On current output device +@@ -150,7 +150,7 @@ + + + + + + + + +@@ -160,14 +161,14 @@ + + +@@ -191,7 +192,7 @@ + + + <_short>Selected Window Highlight + + +@@ -78,30 +78,30 @@ + <_short>Base Color + <_long>First color for the background gradient of the switcher window. + +- 0x0000 +- 0x0000 +- 0x0000 +- 0x6464 ++ 0xcccc ++ 0xcccc ++ 0xe665 ++ 0xd998 + + + + + +@@ -112,20 +112,20 @@ + <_short>Base Color + <_long>First color for the thumb gradient of the switcher window. + +- 0x5555 +- 0x5555 +- 0x5555 +- 0x3232 ++ 0x3333 ++ 0x3333 ++ 0x3333 ++ 0x5999 + + + + +@@ -139,7 +139,7 @@ + 0xffff + 0xffff + 0xffff +- 0xffff ++ 0xf332 + + + + +@@ -201,7 +201,7 @@ + + + +@@ -356,7 +356,7 @@ + + +@@ -254,7 +254,7 @@ + --- a/plugins/cube/cube.xml.in +++ b/plugins/cube/cube.xml.in @@ -123,18 +123,18 @@ From 657d80ad17d3175ca82a46392e47ac30e60f336f Mon Sep 17 00:00:00 2001 From: Luana Date: Sun, 26 May 2024 22:35:20 -0300 Subject: [PATCH 36/46] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e915c51 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Compiz 0.9 on Nix + +I promise I'll add a readme with documentation later, I really need to go to sleep now From d1ca118c792eaedd27a964312283aa1d875a989b Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 27 May 2024 12:54:30 -0300 Subject: [PATCH 37/46] Adds usage and installation documentation --- README.md | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e915c51..8b145c2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,47 @@ # Compiz 0.9 on Nix -I promise I'll add a readme with documentation later, I really need to go to sleep now +This is [Compiz 0.9.x](https://code.launchpad.net/compiz) packaged for NixOS. + +TODO: +- [x] Compiz (Full) +- [ ] Emerald (Full) + +Tragically, Nix decided to remove Compiz from nixpkgs like ages ago. This was the only thing stopping me from migrating to NixOS (since I use compiz at least until I can make my own wayland wm :3), so now compiz is back on the nix land! + +This is a fork of [Gabriel's repo](https://github.com/Misterio77/compiz-nix). He's like the proest of pros when it comes to nix, and he did most of the work packaging this! + + +## Installing + +Add this repo to your flake inputs on your `flake.nix`: +````nix + compiz.url = "github:LuNeder/compiz-reloaded-nix/compiz09"; + compiz.inputs.nixpkgs.follows = "nixpkgs"; +```` + +Then install Compiz from your `environment.systemPackages`: +````nix +inputs.compiz.packages.${pkgs.system}.default +```` + +## Using + +You now should be able to launch Compiz from a terminal with `compiz --replace`. + +If you use XFCE and want to use Compiz as your compositor/window manager, you can add the following to your Home-Manager config to autostart it: + +````nix + # Autostart Compiz + xfconf.settings = { + xfce4-session."sessions/Failsafe/Client1_Command" = [ "xfsettingsd" ]; + xfce4-session."sessions/Failsafe/Client0_Command" = [ "compiz" ]; + }; +```` + +## Configuring + +You can configure Compiz from CompizConfig (CCSM). Run `ccsm` from your terminal or find it in your menu or something. +For now there's no way to configure Compiz directly from Nix but ccsm is really cool (if you want to share your Compiz configuration you can export (and import) it from ccsm). + +## Compiz-Reloaded +I'm also trying to package compiz-reloaded since Compiz 0.9 has some weird bugs (unlike compiz 0.8 / [compiz-reloaded](https://gitlab.com/compiz/compiz-core)), but that's still a wip (see the [main](https://github.com/LuNeder/compiz-reloaded-nix/tree/main) branch of this repo). From 184ce283d6183dd4af2e5de10ec3923f30681215 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 27 May 2024 13:00:43 -0300 Subject: [PATCH 38/46] further documentation --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8b145c2..ce79f4d 100644 --- a/README.md +++ b/README.md @@ -43,5 +43,9 @@ If you use XFCE and want to use Compiz as your compositor/window manager, you ca You can configure Compiz from CompizConfig (CCSM). Run `ccsm` from your terminal or find it in your menu or something. For now there's no way to configure Compiz directly from Nix but ccsm is really cool (if you want to share your Compiz configuration you can export (and import) it from ccsm). +#### Note + +Compiz will launch the `gtk-window-decorator` window decorator on startup by default. If you don't like it, you can change this for your favourite decorator on ccsm. I'll package Emerald someday which will probably be a better fit. + ## Compiz-Reloaded I'm also trying to package compiz-reloaded since Compiz 0.9 has some weird bugs (unlike compiz 0.8 / [compiz-reloaded](https://gitlab.com/compiz/compiz-core)), but that's still a wip (see the [main](https://github.com/LuNeder/compiz-reloaded-nix/tree/main) branch of this repo). From 461230d7dbe74a7607edf2c0fbcc3e64cef22a2d Mon Sep 17 00:00:00 2001 From: Luana Date: Fri, 21 Jun 2024 16:17:06 -0300 Subject: [PATCH 39/46] fix --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 5acce11..1cf98b0 100644 --- a/default.nix +++ b/default.nix @@ -23,7 +23,7 @@ python3, python3Packages, stdenv, - wrapGAppsHook3, + wrapGAppsHook, xorg, xorgserver, ... @@ -46,7 +46,7 @@ stdenv.mkDerivation (f: { python3Packages.cython python3Packages.setuptools python3Packages.wrapPython - wrapGAppsHook3 + wrapGAppsHook ]; buildInputs = [ boost From 7284ebe9c3be0a4f16e92a747ab3b567c45c5e34 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 15 Jul 2024 14:04:49 -0300 Subject: [PATCH 40/46] Tries to fix It broke on its own tho?? --- default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 1cf98b0..68f25b1 100644 --- a/default.nix +++ b/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation (f: { makeWrapper pcre2 pkg-config + python3Packages.distlib + python3Packages.distutils-extra python3Packages.cython python3Packages.setuptools python3Packages.wrapPython @@ -80,6 +82,8 @@ stdenv.mkDerivation (f: { pythonPath = with python3Packages; [ pycairo pygobject3 + distutils-extra + distlib ]; postFixup = '' @@ -98,7 +102,7 @@ stdenv.mkDerivation (f: { do wrapProgram $i \ --prefix PATH : ${lib.makeBinPath [ - (python3.withPackages(pp: [pp.pygobject3])) + (python3.withPackages(pp: [pp.pygobject3 pp.distutils-extra pp.distlib])) ]} done ''; From e989d938ca401afab8d69d9bcf0815803febe238 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 15 Jul 2024 14:15:46 -0300 Subject: [PATCH 41/46] try to fix --- default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.nix b/default.nix index 68f25b1..e195b45 100644 --- a/default.nix +++ b/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation (f: { mesa_glu pcre2 protobuf + python3Packages.distlib + python3Packages.distutils-extra xorg.libXcursor xorg.libXdmcp xorgserver From a2d618752322f64419f7b1efdd030de9d42a152b Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 15 Jul 2024 14:46:03 -0300 Subject: [PATCH 42/46] Tries to fix, again Fix copied from: https://github.com/NixOS/nixpkgs/pull/325909/files Related: https://github.com/NixOS/nixpkgs/pull/325909 and https://github.com/NixOS/nixpkgs/issues/253751 --- default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/default.nix b/default.nix index e195b45..1e12cd6 100644 --- a/default.nix +++ b/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (f: { makeWrapper pcre2 pkg-config + (python3Packages.python.withPackages (p: [ p.setuptools ])) python3Packages.distlib python3Packages.distutils-extra python3Packages.cython @@ -67,8 +68,6 @@ stdenv.mkDerivation (f: { mesa_glu pcre2 protobuf - python3Packages.distlib - python3Packages.distutils-extra xorg.libXcursor xorg.libXdmcp xorgserver @@ -84,8 +83,6 @@ stdenv.mkDerivation (f: { pythonPath = with python3Packages; [ pycairo pygobject3 - distutils-extra - distlib ]; postFixup = '' From c817fb6aa6aefd76ace25b48782ee3af65179945 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 15 Jul 2024 15:03:39 -0300 Subject: [PATCH 43/46] Actually fixes now (hopefully) Fix from https://github.com/NixOS/nixpkgs/pull/325773/files (and Natan from GELOS) --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6d6a3b3..e8f79e5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,14 +12,14 @@ forEachSystem = nixpkgs.lib.genAttrs (import systems); in { overlays.default = final: prev: { - compiz = final.callPackage ./. {}; + compiz = final.callPackage ./. { python3 = pkgs.python311; python3Packages = pkgs.python311Packages; }; }; packages = forEachSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in rec { default = compiz; - compiz = pkgs.callPackage ./. {}; + compiz = pkgs.callPackage ./. { python3 = pkgs.python311; python3Packages = pkgs.python311Packages; }; }); }; } From 43cad36d225a0d040d2d6ab1e77abc5628f83b30 Mon Sep 17 00:00:00 2001 From: Luana Date: Mon, 15 Jul 2024 15:09:53 -0300 Subject: [PATCH 44/46] Maybe fixes? Fix from https://github.com/NixOS/nixpkgs/pull/325773/files and Natan from GELOS --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e8f79e5..d1945f5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ forEachSystem = nixpkgs.lib.genAttrs (import systems); in { overlays.default = final: prev: { - compiz = final.callPackage ./. { python3 = pkgs.python311; python3Packages = pkgs.python311Packages; }; + compiz = final.callPackage ./. { python3 = final.python311; python3Packages = final.python311Packages; }; }; packages = forEachSystem (system: let From 6ff6ea3532039b365e610b451ceded6063021493 Mon Sep 17 00:00:00 2001 From: Luana Date: Sat, 14 Sep 2024 14:30:28 -0300 Subject: [PATCH 45/46] fix --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 1e12cd6..67bc294 100644 --- a/default.nix +++ b/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (f: { cairo fuse glibmm - gnome.metacity + metacity gobject-introspection gtk3 intltool @@ -92,7 +92,7 @@ stdenv.mkDerivation (f: { wrapProgram "$out/bin/compiz-decorator" \ --prefix COMPIZ_BIN_PATH : "$out/bin/" \ - --prefix PATH : "${gnome.metacity}/bin" + --prefix PATH : "${metacity}/bin" # Wrap CCSM with GApps and Python path makeWrapperArgs+=("''${gappsWrapperArgs[@]}") From 774f201dc9ff9008eec7b4ebd0c01f964c7e6e3f Mon Sep 17 00:00:00 2001 From: Luana Date: Sat, 14 Sep 2024 14:31:35 -0300 Subject: [PATCH 46/46] fix --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 67bc294..eaaddc0 100644 --- a/default.nix +++ b/default.nix @@ -7,6 +7,7 @@ fuse, glibmm, gnome, + metacity, gobject-introspection, gtk3, intltool,