From 7c116c767d762955748bb67fd4f4f4e2aafb1eb8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 28 Jan 2025 11:33:10 +0100 Subject: ... --- _sources/generated.json | 20 ++++++++++++++++++++ _sources/generated.nix | 14 ++++++++++++++ accounts/gkleen@sif/niri/swayosd.nix | 4 ++-- nvfetcher.toml | 6 +++++- overlays/swayosd.nix | 27 +++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 overlays/swayosd.nix diff --git a/_sources/generated.json b/_sources/generated.json index e82d7fe6..72f913ec 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -365,6 +365,26 @@ }, "version": "0.2.1" }, + "swayosd": { + "cargoLocks": null, + "date": "2025-01-27", + "extract": null, + "name": "swayosd", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "rev": "993180b5e7db1dfc453a556bf208f05b04283c8f", + "sha256": "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=", + "sparseCheckout": [], + "type": "git", + "url": "https://github.com/ErikReider/SwayOSD" + }, + "version": "993180b5e7db1dfc453a556bf208f05b04283c8f" + }, "tomorrow-night-paradise-theme": { "cargoLocks": null, "date": "2012-06-04", diff --git a/_sources/generated.nix b/_sources/generated.nix index c1a0c6a0..e25f1bda 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -224,6 +224,20 @@ sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8="; }; }; + swayosd = { + pname = "swayosd"; + version = "993180b5e7db1dfc453a556bf208f05b04283c8f"; + src = fetchgit { + url = "https://github.com/ErikReider/SwayOSD"; + rev = "993180b5e7db1dfc453a556bf208f05b04283c8f"; + fetchSubmodules = false; + deepClone = false; + leaveDotGit = false; + sparseCheckout = [ ]; + sha256 = "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI="; + }; + date = "2025-01-27"; + }; tomorrow-night-paradise-theme = { pname = "tomorrow-night-paradise-theme"; version = "70225a5bf90d495e13a9260bfdc268632ece0801"; diff --git a/accounts/gkleen@sif/niri/swayosd.nix b/accounts/gkleen@sif/niri/swayosd.nix index 48899c10..39945ba8 100644 --- a/accounts/gkleen@sif/niri/swayosd.nix +++ b/accounts/gkleen@sif/niri/swayosd.nix @@ -3,14 +3,14 @@ config = { services.swayosd = { enable = true; - topMargin = 0.0344; + topMargin = 0.946154; stylePath = pkgs.runCommand "style.css" { src = pkgs.writeText "style.scss" '' window#osd { padding: 12px 20px; border-radius: 999px; border: none; - background: rgba(0, 0, 0, 0.66); + background: rgba(0, 0, 0, 0.87); #container { margin: 16px; diff --git a/nvfetcher.toml b/nvfetcher.toml index e7ba37e5..ecaebba0 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -110,4 +110,8 @@ fetch.pypi = "yt_dlp" [mako] src.git = "https://github.com/emersion/mako" -fetch.git = "https://github.com/emersion/mako" \ No newline at end of file +fetch.git = "https://github.com/emersion/mako" + +[swayosd] +src.git = "https://github.com/ErikReider/SwayOSD" +fetch.git = "https://github.com/ErikReider/SwayOSD" diff --git a/overlays/swayosd.nix b/overlays/swayosd.nix new file mode 100644 index 00000000..61c865e7 --- /dev/null +++ b/overlays/swayosd.nix @@ -0,0 +1,27 @@ +{ final, prev, sources, ... }: { + swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec { + inherit (sources.swayosd) version src; + cargoDeps = prev.rustPlatform.fetchCargoTarball { + inherit (oldAttrs) pname; + inherit version src; + hash = "sha256-Anrk8p76HKZcNavYdi9l1oYahduLrb7Lf7knQK7Hy5E="; + }; + nativeBuildInputs = with final; [ + wrapGAppsHook4 + pkg-config + meson + rustc + cargo + ninja + rustPlatform.cargoSetupHook + ]; + buildInputs = with final; [ + gtk4-layer-shell + libevdev + libinput + libpulseaudio + udev + sassc + ]; + }); +} -- cgit v1.2.3