From 64e5608748832d7d8108ab1abcecf2d7d32e8ba1 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Tue, 21 Apr 2026 22:56:11 +0300 Subject: [PATCH] fixes Signed-off-by: elwrcl --- flake.lock | 39 +---------------- flake.nix | 4 -- home/hypr/default.nix | 1 - home/hypr/hyprland/general.nix | 26 ++++++------ home/hypr/hyprland/plugins.nix | 76 ---------------------------------- 5 files changed, 14 insertions(+), 132 deletions(-) delete mode 100644 home/hypr/hyprland/plugins.nix diff --git a/flake.lock b/flake.lock index d2be568..2a9b88d 100644 --- a/flake.lock +++ b/flake.lock @@ -498,27 +498,6 @@ "type": "github" } }, - "hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1775071961, - "narHash": "sha256-LXkeeH9Blr6ohS1LAsVZbkJ/EAkkMDATh5qu45hC7Zo=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "12ddde04f8584bf7de3151e6169918e0dda9f822", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -811,7 +790,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -890,7 +869,6 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "hyprspace": "hyprspace", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_4", "noctalia": "noctalia", @@ -1027,21 +1005,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 2730900..4dae680 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,6 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - hyprspace = { - url = "github:KZDKM/Hyprspace"; - inputs.hyprland.follows = "hyprland"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/hypr/default.nix b/home/hypr/default.nix index a9f72b5..efaebe3 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -7,6 +7,5 @@ ./hyprland/general.nix ./hyprland/rules.nix ./hyprland/keybinds.nix - ./hyprland/plugins.nix ]; } diff --git a/home/hypr/hyprland/general.nix b/home/hypr/hyprland/general.nix index 77e7edf..39d623c 100644 --- a/home/hypr/hyprland/general.nix +++ b/home/hypr/hyprland/general.nix @@ -82,19 +82,19 @@ ]; animation = [ - "windowsIn, 1, 5, omniOvershoot, popin 82%" - "windowsOut, 1, 4, omniAccel, popin 90%" - "windowsMove, 1, 5, omniDecel, slide" - "fadeIn, 1, 4, omniDecel" - "fadeOut, 1, 3, omniAccel" - "border, 1, 8, omniSmooth" - "layersIn, 1, 4, omniDecel, popin 90%" - "layersOut, 1, 3, omniAccel, popin 93%" - "fadeLayersIn, 1, 2, omniDecel" - "fadeLayersOut, 1, 2, omniAccel" - "workspaces, 1, 7, omniDecel, slide" - "specialWorkspaceIn, 1, 4, omniDecel, slidevert" - "specialWorkspaceOut, 1, 3, omniAccel, slidevert" + "windowsIn, 1, 6, omniOvershoot, popin 86%" + "windowsOut, 1, 5, omniAccel, popin 92%" + "windowsMove, 1, 6, omniDecel, slide" + "fadeIn, 1, 5, omniDecel" + "fadeOut, 1, 4, omniAccel" + "border, 1, 10, omniSmooth" + "layersIn, 1, 5, omniDecel, popin 92%" + "layersOut, 1, 4, omniAccel, popin 94%" + "fadeLayersIn, 1, 3, omniDecel" + "fadeLayersOut, 1, 3, omniAccel" + "workspaces, 1, 8, omniDecel, slide" + "specialWorkspaceIn, 1, 5, omniDecel, slidevert" + "specialWorkspaceOut, 1, 4, omniAccel, slidevert" ]; device = [ diff --git a/home/hypr/hyprland/plugins.nix b/home/hypr/hyprland/plugins.nix deleted file mode 100644 index d37afd2..0000000 --- a/home/hypr/hyprland/plugins.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ inputs, pkgs, ... }: - -let - hyprspace = inputs.hyprspace.packages.${pkgs.system}.Hyprspace.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - sed -i '/#include /a #include ' src/Globals.hpp - sed -i '/#include /a #include ' src/Globals.hpp - sed -i '/#include /a #include ' src/Globals.hpp - - substituteInPlace src/Globals.hpp \ - --replace-fail 'eRenderPassMode' 'Render::eRenderPassMode' - - substituteInPlace src/Layout.cpp \ - --replace-fail 'CCssGapData' 'Config::CCssGapData' \ - --replace-fail 'g_pConfigManager->handleWorkspaceRules' 'Config::Legacy::mgr()->handleWorkspaceRules' - - substituteInPlace src/Overview.cpp \ - --replace-fail 'g_pConfigManager->getAnimationPropertyConfig' 'Config::animationTree()->getAnimationPropertyConfig' - - substituteInPlace src/Render.cpp \ - --replace-fail 'SRenderModifData' 'Render::SRenderModifData' \ - --replace-fail 'g_pHyprOpenGL->m_renderData' 'g_pHyprRenderer->m_renderData' \ - --replace-fail 'RENDER_PASS_ALL' 'Render::RENDER_PASS_ALL' \ - --replace-fail 'g_pHyprRenderer->m_renderData.pCurrentMonData->blurFBShouldRender = true;' '// blur API changed in Hyprland 0.54' - - substituteInPlace src/main.cpp \ - --replace-fail 'g_pHyprOpenGL->m_renderData' 'g_pHyprRenderer->m_renderData' \ - --replace-fail 'RENDER_PASS_MAIN' 'Render::RENDER_PASS_MAIN' - - sed -i '/^void renderBorder(CBox box, CGradientValueData gradient, int size) {/,/^}/c\ -void renderBorder(CBox box, CHyprColor color, int size) {\ - if (size <= 0 || color.a <= 0.F)\ - return;\ -\ - renderRect({box.x, box.y, box.w, size}, color);\ - renderRect({box.x, box.y + box.h - size, box.w, size}, color);\ - renderRect({box.x, box.y, size, box.h}, color);\ - renderRect({box.x + box.w - size, box.y, size, box.h}, color);\ -}' src/Render.cpp - - substituteInPlace src/Render.cpp \ - --replace-fail 'renderBorder(curWorkspaceBox, CGradientValueData(Config::workspaceActiveBorder), Config::workspaceBorderSize);' 'renderBorder(curWorkspaceBox, Config::workspaceActiveBorder, Config::workspaceBorderSize);' \ - --replace-fail 'renderBorder(curWorkspaceBox, CGradientValueData(Config::workspaceInactiveBorder), Config::workspaceBorderSize);' 'renderBorder(curWorkspaceBox, Config::workspaceInactiveBorder, Config::workspaceBorderSize);' - ''; - }); -in -{ - wayland.windowManager.hyprland = { - plugins = [ hyprspace ]; - - settings = { - bind = [ - "$mainMod, TAB, exec, hyprctl dispatch overview:toggle" - ]; - - plugin = { - overview = { - workspaceActiveBorder = "rgba(ffffffff)"; - workspaceInactiveBorder = "rgba(ffffff66)"; - workspaceBorderSize = 2; - workspaceActiveBackground = "rgba(ffffff18)"; - workspaceInactiveBackground = "rgba(00000066)"; - panelBorderColor = "rgba(ffffffff)"; - panelBorderWidth = 2; - panelHeight = 240; - workspaceMargin = 14; - overrideAnimSpeed = 0.9; - autoDrag = true; - autoScroll = true; - centerAligned = true; - exitOnClick = true; - }; - }; - }; - }; -}