summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.lock32
-rw-r--r--flake.nix2
-rw-r--r--modules/desktops/hyprland/plugins.nix2
-rw-r--r--pkgs/default.nix3
-rw-r--r--pkgs/hy3/0001-fix-renderPass-pointer.patch69
-rw-r--r--pkgs/hy3/default.nix6
6 files changed, 19 insertions, 95 deletions
diff --git a/flake.lock b/flake.lock
index 8e62e2c..6cbcc16 100644
--- a/flake.lock
+++ b/flake.lock
@@ -160,11 +160,11 @@
]
},
"locked": {
- "lastModified": 1752449767,
- "narHash": "sha256-P8mQIrgIImASTlNkHPfKwGTmyZgku8EUt6cF52s3N/Y=",
+ "lastModified": 1752603129,
+ "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1a4d8ffd320c2393b72e7ebc5b647122d5703056",
+ "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
"type": "github"
},
"original": {
@@ -181,11 +181,11 @@
]
},
"locked": {
- "lastModified": 1747077256,
- "narHash": "sha256-ryaXKevnISRiJb93QIAv7tGc6ZJqSkwETKm4oGh8HWI=",
+ "lastModified": 1752556827,
+ "narHash": "sha256-HGpEQ71IzBQA8Fzh5hmuch1unE74JlS5OyYhb7Dm+bI=",
"owner": "outfoxxed",
"repo": "hy3",
- "rev": "567dc9dd20e15d95a56a81c516a70dba30bc2c9c",
+ "rev": "8911d4b65d7ec7ba45fb0744030051e85c82bdf7",
"type": "github"
},
"original": {
@@ -270,11 +270,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1752337367,
- "narHash": "sha256-kEumflYEdQSrZZQEr7kik2sBfFohEx0TsJB1rBVAQy4=",
+ "lastModified": 1752658422,
+ "narHash": "sha256-02Gwtihml2IY3l03sumRwuxJUzHe/fCe5DmkPNIZCSc=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "d0f58baf296a2cdd5df0f82212fe17dfbef8438e",
+ "rev": "c4a4c341568944bd4fb9cd503558b2de602c0213",
"type": "github"
},
"original": {
@@ -508,17 +508,17 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1751984180,
- "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+ "lastModified": 1752639122,
+ "narHash": "sha256-ogB9SzFuMpriRs/SwtA097KSoTFK7hKoMXckN9+R1Ds=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+ "rev": "91e56b8907108960a13bb79ba6587524348b679c",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
"repo": "nixpkgs",
+ "rev": "91e56b8907108960a13bb79ba6587524348b679c",
"type": "github"
}
},
@@ -688,11 +688,11 @@
]
},
"locked": {
- "lastModified": 1751606940,
- "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
+ "lastModified": 1752544651,
+ "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
+ "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 0015bcd..7623ff2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
inputs = {
# nixpkgs
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/91e56b8907108960a13bb79ba6587524348b679c";
# home manager
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/desktops/hyprland/plugins.nix b/modules/desktops/hyprland/plugins.nix
index 21aff3b..e4d66ef 100644
--- a/modules/desktops/hyprland/plugins.nix
+++ b/modules/desktops/hyprland/plugins.nix
@@ -8,7 +8,7 @@
wayland.windowManager.hyprland = {
plugins = [
inputs.hyprland-plugins.packages.${system}.hyprexpo
- inputs.self.packages.${system}.hy3
+ inputs.hy3.packages.${system}.hy3
];
settings.plugin = {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 406669b..d9f6fee 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,8 +1,7 @@
{pkgs, ...} @ inputs: {
arcanist = pkgs.callPackage ./arcanist {};
astal = pkgs.callPackage ./astal inputs;
- hy3 = pkgs.callPackage ./hy3 inputs;
- libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
+ gibfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
ly = pkgs.callPackage ./ly {};
unofficial-homestuck-collection = pkgs.callPackage ./unofficial-homestuck-collection {};
}
diff --git a/pkgs/hy3/0001-fix-renderPass-pointer.patch b/pkgs/hy3/0001-fix-renderPass-pointer.patch
deleted file mode 100644
index 307506c..0000000
--- a/pkgs/hy3/0001-fix-renderPass-pointer.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f12b2a8f370f2095035a9aa97dac8179d79a7383 Mon Sep 17 00:00:00 2001
-From: Freya Murphy <freya@freyacat.org>
-Date: Sun, 13 Jul 2025 11:25:42 -0400
-Subject: [PATCH] fix renderPass pointer
-
----
- src/Hy3Layout.cpp | 5 +++--
- src/TabGroup.cpp | 1 -
- src/TabGroup.hpp | 2 --
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
-index b10aced..70b75bc 100644
---- a/src/Hy3Layout.cpp
-+++ b/src/Hy3Layout.cpp
-@@ -15,6 +15,7 @@
- #include <hyprland/src/plugins/PluginAPI.hpp>
- #include <hyprland/src/plugins/PluginSystem.hpp>
- #include <hyprutils/math/Vector2D.hpp>
-+#include <hyprutils/memory/UniquePtr.hpp>
- #include <ranges>
-
- #include "Hy3Layout.hpp"
-@@ -1580,7 +1581,7 @@ void Hy3Layout::renderHook(void*, SCallbackInfo&, std::any data) {
- && std::find(rendered_groups.begin(), rendered_groups.end(), &entry)
- == rendered_groups.end())
- {
-- g_pHyprRenderer->m_renderPass.add(entry.pass);
-+ g_pHyprRenderer->m_renderPass.add(makeUnique<Hy3TabPassElement>(&entry));
- rendered_groups.push_back(&entry);
- }
- }
-@@ -1595,7 +1596,7 @@ void Hy3Layout::renderHook(void*, SCallbackInfo&, std::any data) {
- && std::find(rendered_groups.begin(), rendered_groups.end(), &entry)
- == rendered_groups.end())
- {
-- g_pHyprRenderer->m_renderPass.add(entry.pass);
-+ g_pHyprRenderer->m_renderPass.add(makeUnique<Hy3TabPassElement>(&entry));
- entry.renderTabBar();
- }
- }
-diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
-index 4c2c845..1f7fe4d 100644
---- a/src/TabGroup.cpp
-+++ b/src/TabGroup.cpp
-@@ -16,7 +16,6 @@
- #include <hyprland/src/render/Texture.hpp>
- #include <hyprutils/math/Box.hpp>
- #include <hyprutils/math/Region.hpp>
--#include <hyprutils/memory/SharedPtr.hpp>
- #include <pango/pangocairo.h>
- #include <pixman.h>
-
-diff --git a/src/TabGroup.hpp b/src/TabGroup.hpp
-index ec254e9..dafa065 100644
---- a/src/TabGroup.hpp
-+++ b/src/TabGroup.hpp
-@@ -130,8 +130,6 @@ public:
- // render the scaled tab bar on the current monitor.
- void renderTabBar();
-
-- SP<Hy3TabPassElement> pass = makeShared<Hy3TabPassElement>(this);
--
- private:
- std::vector<PHLWINDOWREF> stencil_windows;
- Vector2D last_workspace_offset;
---
-2.49.0
-
diff --git a/pkgs/hy3/default.nix b/pkgs/hy3/default.nix
deleted file mode 100644
index 316046b..0000000
--- a/pkgs/hy3/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{system, inputs, ...}:
-inputs.hy3.packages.${system}.hy3.overrideAttrs {
- patches = [
- ./0001-fix-renderPass-pointer.patch
- ];
-}
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-22 21:33:51 +0000