summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2025-01-28 11:33:10 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2025-01-28 11:33:10 +0100
commit7c116c767d762955748bb67fd4f4f4e2aafb1eb8 (patch)
treeb66666755adc21b4d52af8dbe1628c776978bfaa
parent3315faabe0201f9a209235ef5291f02076dbcbac (diff)
downloadnixos-7c116c767d762955748bb67fd4f4f4e2aafb1eb8.tar
nixos-7c116c767d762955748bb67fd4f4f4e2aafb1eb8.tar.gz
nixos-7c116c767d762955748bb67fd4f4f4e2aafb1eb8.tar.bz2
nixos-7c116c767d762955748bb67fd4f4f4e2aafb1eb8.tar.xz
nixos-7c116c767d762955748bb67fd4f4f4e2aafb1eb8.zip
...
-rw-r--r--_sources/generated.json20
-rw-r--r--_sources/generated.nix14
-rw-r--r--accounts/gkleen@sif/niri/swayosd.nix4
-rw-r--r--nvfetcher.toml6
-rw-r--r--overlays/swayosd.nix27
5 files changed, 68 insertions, 3 deletions
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 @@
365 }, 365 },
366 "version": "0.2.1" 366 "version": "0.2.1"
367 }, 367 },
368 "swayosd": {
369 "cargoLocks": null,
370 "date": "2025-01-27",
371 "extract": null,
372 "name": "swayosd",
373 "passthru": null,
374 "pinned": false,
375 "src": {
376 "deepClone": false,
377 "fetchSubmodules": false,
378 "leaveDotGit": false,
379 "name": null,
380 "rev": "993180b5e7db1dfc453a556bf208f05b04283c8f",
381 "sha256": "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=",
382 "sparseCheckout": [],
383 "type": "git",
384 "url": "https://github.com/ErikReider/SwayOSD"
385 },
386 "version": "993180b5e7db1dfc453a556bf208f05b04283c8f"
387 },
368 "tomorrow-night-paradise-theme": { 388 "tomorrow-night-paradise-theme": {
369 "cargoLocks": null, 389 "cargoLocks": null,
370 "date": "2012-06-04", 390 "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 @@
224 sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8="; 224 sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8=";
225 }; 225 };
226 }; 226 };
227 swayosd = {
228 pname = "swayosd";
229 version = "993180b5e7db1dfc453a556bf208f05b04283c8f";
230 src = fetchgit {
231 url = "https://github.com/ErikReider/SwayOSD";
232 rev = "993180b5e7db1dfc453a556bf208f05b04283c8f";
233 fetchSubmodules = false;
234 deepClone = false;
235 leaveDotGit = false;
236 sparseCheckout = [ ];
237 sha256 = "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=";
238 };
239 date = "2025-01-27";
240 };
227 tomorrow-night-paradise-theme = { 241 tomorrow-night-paradise-theme = {
228 pname = "tomorrow-night-paradise-theme"; 242 pname = "tomorrow-night-paradise-theme";
229 version = "70225a5bf90d495e13a9260bfdc268632ece0801"; 243 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 @@
3 config = { 3 config = {
4 services.swayosd = { 4 services.swayosd = {
5 enable = true; 5 enable = true;
6 topMargin = 0.0344; 6 topMargin = 0.946154;
7 stylePath = pkgs.runCommand "style.css" { 7 stylePath = pkgs.runCommand "style.css" {
8 src = pkgs.writeText "style.scss" '' 8 src = pkgs.writeText "style.scss" ''
9 window#osd { 9 window#osd {
10 padding: 12px 20px; 10 padding: 12px 20px;
11 border-radius: 999px; 11 border-radius: 999px;
12 border: none; 12 border: none;
13 background: rgba(0, 0, 0, 0.66); 13 background: rgba(0, 0, 0, 0.87);
14 14
15 #container { 15 #container {
16 margin: 16px; 16 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"
110 110
111[mako] 111[mako]
112src.git = "https://github.com/emersion/mako" 112src.git = "https://github.com/emersion/mako"
113fetch.git = "https://github.com/emersion/mako" \ No newline at end of file 113fetch.git = "https://github.com/emersion/mako"
114
115[swayosd]
116src.git = "https://github.com/ErikReider/SwayOSD"
117fetch.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 @@
1{ final, prev, sources, ... }: {
2 swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
3 inherit (sources.swayosd) version src;
4 cargoDeps = prev.rustPlatform.fetchCargoTarball {
5 inherit (oldAttrs) pname;
6 inherit version src;
7 hash = "sha256-Anrk8p76HKZcNavYdi9l1oYahduLrb7Lf7knQK7Hy5E=";
8 };
9 nativeBuildInputs = with final; [
10 wrapGAppsHook4
11 pkg-config
12 meson
13 rustc
14 cargo
15 ninja
16 rustPlatform.cargoSetupHook
17 ];
18 buildInputs = with final; [
19 gtk4-layer-shell
20 libevdev
21 libinput
22 libpulseaudio
23 udev
24 sassc
25 ];
26 });
27}