From de35d3d1e21ed93f54d7934f98b5e507411dceca Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 24 Jun 2023 01:30:51 +1000 Subject: [PATCH] update eww --- flake.lock | 72 ++++++++++++++++++++++++------------------------ home/home.nix | 1 + pkgs/default.nix | 3 +- pkgs/eww.nix | 48 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 37 deletions(-) create mode 100644 pkgs/eww.nix diff --git a/flake.lock b/flake.lock index 0b948b8..7a23afd 100644 --- a/flake.lock +++ b/flake.lock @@ -236,11 +236,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1687030596, - "narHash": "sha256-/CYQbXQaHCiTuVxpHB6+1ywBM4TW5iviYwHsYarbbAM=", + "lastModified": 1687530962, + "narHash": "sha256-1YU3uObpJjUYv9kj0kzwYmNM/1c1pDdRsGGtPRuNk2M=", "owner": "helix-editor", "repo": "helix", - "rev": "d5af6031f6ccd0a3f32efbb210aec24cd9c71ab1", + "rev": "93ac70684437b2da4708a8e20c60ac31052138b3", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1687081547, - "narHash": "sha256-/JV70TxhvP2r4xYtTlbQ2rrRDcj7MqHnF13r5ZE0oFc=", + "lastModified": 1687506590, + "narHash": "sha256-CSou9mrG9h/WVRjCptfTrATVxvhmtdQXElmWV/ZkrAs=", "owner": "nix-community", "repo": "home-manager", - "rev": "28c823032cabfaa340a09e1d84cf45d11375c644", + "rev": "d2b6f2d154bf6b27a93ed895392f80c503df7cfa", "type": "github" }, "original": { @@ -360,11 +360,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685380658, - "narHash": "sha256-LPih0Q//p8IurXG9kGRVGAqV4AUKVYj9xkk3sYYAj6I=", + "lastModified": 1687521241, + "narHash": "sha256-7UtJ6mmz5NidH+5yeEXWZRHLPAeMbVx2M4aQFuOS8Sk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "51a930f802c71a0e67f05e7b176ded74e8e95f87", + "rev": "69fae18e636ed154798c21ed5c1127672127c6ac", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1686740472, - "narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=", + "lastModified": 1687097842, + "narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e11c61073b777e025993c5ef63ddbf776a9cca15", + "rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1686592866, + "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "type": "github" }, "original": { @@ -591,11 +591,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "lastModified": 1687412861, + "narHash": "sha256-Z/g0wbL68C+mSGerYS2quv9FXQ1RRP082cAC0Bh4vcs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "rev": "e603dc5f061ca1d8a19b3ede6a8cf9c9fcba6cdc", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nur": { "locked": { - "lastModified": 1687086575, - "narHash": "sha256-S3G+lcNCUTbGke3R/ZJ/M4enA9ivsFtMSPfcFfWuMkI=", + "lastModified": 1687517250, + "narHash": "sha256-ljok9lDztDPtoOIqloqQk3hjgkCaqvPUahGev0BV8rM=", "owner": "nix-community", "repo": "NUR", - "rev": "4f44536cefa72a74dc0582aebf7533abde0d02f0", + "rev": "de92a89de58f918bdd6039521146c545e4f01a0d", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1687055571, - "narHash": "sha256-UvLoO6u5n9TzY80BpM4DaacxvyJl7u9mm9CA72d309g=", + "lastModified": 1687400833, + "narHash": "sha256-rVENiSupjAE8o1+ZXNRIqewUzM2brm+aeme8MUrwl0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2de557c780dcb127128ae987fca9d6c2b0d7dc0f", + "rev": "fc0a266e836c079a9131108f4334e5af219dbb93", "type": "github" }, "original": { @@ -777,11 +777,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1682436395, - "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", + "lastModified": 1686753331, + "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", "owner": "wlroots", "repo": "wlroots", - "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", + "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", "type": "gitlab" }, "original": { @@ -803,11 +803,11 @@ ] }, "locked": { - "lastModified": 1682439384, - "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index c3cfdb9..2fe2d28 100644 --- a/home/home.nix +++ b/home/home.nix @@ -124,6 +124,7 @@ in { programs.eww-hyprland = { enable = true; + package = pkgs.eww-git; colors = with palette-hex; (builtins.replaceStrings [ "#BLACK" diff --git a/pkgs/default.nix b/pkgs/default.nix index f7badf1..dec0e83 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,8 @@ {pkgs, ...}: { hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {}; culr = pkgs.callPackage ./culr.nix {}; - everforest-theme = pkgs.callPackage ./everforst-theme.nix {}; + eww-git = pkgs.callPackage ./eww.nix {}; + # everforest-theme = pkgs.callPackage ./everforst-theme.nix {}; # coconut = pkgs.python310Packages.callPackage ./coconut.nix {}; # kanagawa-icons = pkgs.callPackage ./kanagawa-icons.nix {}; # gruvbox-kvantum = pkgs.callPackage ./gruvbox-kvantum.nix {}; diff --git a/pkgs/eww.nix b/pkgs/eww.nix new file mode 100644 index 0000000..42cdfe2 --- /dev/null +++ b/pkgs/eww.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, gtk3 +, gdk-pixbuf +, withWayland ? true +, gtk-layer-shell +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "eww"; + version = "0.4.0-dirty"; + + src = fetchFromGitHub { + owner = "elkowar"; + repo = pname; + rev = "25e50eda46379bccd8a7887c18ee35833e0460e8"; + sha256 = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4="; + }; + + cargoSha256 = "sha256-25CoBVIofOCBy8ChMesIKaGoluwpy8tYo+zaFLSaiEo="; + + # cargoPatches = [ ./Cargo.lock.patch ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 gdk-pixbuf ] ++ lib.optional withWayland gtk-layer-shell; + + buildNoDefaultFeatures = withWayland; + buildFeatures = lib.optional withWayland "wayland"; + + cargoBuildFlags = [ "--bin" "eww" ]; + + cargoTestFlags = cargoBuildFlags; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "ElKowars wacky widgets"; + homepage = "https://github.com/elkowar/eww"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda lom ]; + broken = stdenv.isDarwin; + }; +}