From f9a2243893ee2992013adf1c347efaaed27262e2 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Thu, 19 Jun 2025 01:54:24 +0200 Subject: [PATCH] add wayland crosshair thing --- flake.lock | 87 ++++++++++++++++++++++++++++++++++++++---- flake.nix | 3 ++ hosts/nixdesk/home.nix | 6 +++ 3 files changed, 88 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index a7fca34..7e907ce 100644 --- a/flake.lock +++ b/flake.lock @@ -68,6 +68,21 @@ } }, "crane": { + "locked": { + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1745454774, "narHash": "sha256-oLvmxOnsEKGtwczxp/CwhrfmQUG2ym24OMWowcoRhH8=", @@ -82,7 +97,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "locked": { "lastModified": 1742394900, "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", @@ -97,6 +112,28 @@ "type": "github" } }, + "crosshair-overlay": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750290749, + "narHash": "sha256-Wd6BlAKF9h8cN+V0BYRXyhdIhoAWV9C0IX5y+RhiVZQ=", + "ref": "refs/heads/master", + "rev": "20693cdf66818e5644b538ccf9acacc82a2828e2", + "revCount": 6, + "type": "git", + "url": "https://git.xunuwu.xyz/xun/crosshair-overlay" + }, + "original": { + "type": "git", + "url": "https://git.xunuwu.xyz/xun/crosshair-overlay" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -359,7 +396,25 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -684,7 +739,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -819,7 +874,7 @@ }, "roblox-playtime": { "inputs": { - "crane": "crane", + "crane": "crane_2", "nixpkgs": [ "nixpkgs" ], @@ -841,6 +896,7 @@ }, "root": { "inputs": { + "crosshair-overlay": "crosshair-overlay", "disko": "disko", "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", @@ -920,7 +976,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1001,6 +1057,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1128,7 +1199,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -1161,8 +1232,8 @@ }, "wayland-appusage": { "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_2", + "crane": "crane_3", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 926fb7f..6abc621 100644 --- a/flake.nix +++ b/flake.nix @@ -112,5 +112,8 @@ own-website.url = "github:xunuwu/xunuwu.xyz"; own-website.inputs.nixpkgs.follows = "nixpkgs"; + + crosshair-overlay.url = "git+https://git.xunuwu.xyz/xun/crosshair-overlay"; + crosshair-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; } diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index 63864d2..289c961 100644 --- a/hosts/nixdesk/home.nix +++ b/hosts/nixdesk/home.nix @@ -156,6 +156,12 @@ prismlauncher inputs.sobercookie.packages.${pkgs.system}.default self.packages.${pkgs.system}.krunker + (writeScriptBin "crosshair-overlay" '' + ${lib.getExe bubblewrap} \ + --ro-bind / / \ + --chdir "$XDG_PICTURES_DIR" \ + -- ${inputs.crosshair-overlay.packages.${pkgs.system}.default}/bin/crosshair-overlay $@ + '') ]; home = {