From 862b60c351a8826c6e3682ef7431ba63feaaca85 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 22 Feb 2026 11:54:32 -0500 Subject: [PATCH] switch from awww to wbg, fight over? --- flake.lock | 62 +-------------------------------------- flake.nix | 7 ----- home/tiling/niri.nix | 5 +--- home/tiling/wallpaper.nix | 22 ++++---------- 4 files changed, 8 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index e69014b..7d674c4 100644 --- a/flake.lock +++ b/flake.lock @@ -40,28 +40,6 @@ "type": "github" } }, - "awww": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1770895252, - "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", - "ref": "refs/heads/main", - "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", - "revCount": 1331, - "type": "git", - "url": "https://codeberg.org/LGFae/awww.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/LGFae/awww.git" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -160,22 +138,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1767039857, @@ -358,7 +320,7 @@ "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, @@ -578,7 +540,6 @@ "inputs": { "aerothemeplasma-nix": "aerothemeplasma-nix", "apple-silicon": "apple-silicon", - "awww": "awww", "base16": "base16", "base16-discord": "base16-discord", "catppuccin-discord": "catppuccin-discord", @@ -600,27 +561,6 @@ "tt-schemes": "tt-schemes" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "awww", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spicetify-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index b95f95c..0ff254f 100644 --- a/flake.nix +++ b/flake.nix @@ -86,11 +86,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; - awww = { - url = "git+https://codeberg.org/LGFae/awww.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - openmw = { url = "gitlab:OpenMW/openmw/01bcd6a6369fe461caaf900354967b4751aede7a"; flake = false; @@ -119,7 +114,6 @@ nur, nixvim, apple-silicon, - awww, openmw, catppuccin-discord, ... @@ -163,7 +157,6 @@ niri.overlays.niri noctalia.overlays.default nur.overlays.default - awww.overlays.default (final: prev: { openmw-git = openmw; catppuccin-discord-git = catppuccin-discord; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index d9c07fe..653ac7e 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -236,10 +236,7 @@ }; } { - matches = [ - { namespace = "^wpaperd.*"; } - { namespace = "^awww-daemon"; } - ]; + matches = [ { namespace = "^wallpaper$"; } ]; place-within-backdrop = true; } ]; diff --git a/home/tiling/wallpaper.nix b/home/tiling/wallpaper.nix index e3e8bad..76d65a7 100644 --- a/home/tiling/wallpaper.nix +++ b/home/tiling/wallpaper.nix @@ -3,23 +3,13 @@ ... }: { - systemd.user.services.awww-daemon = { - Unit.Description = "Wallpaper service using awww (daemon)"; - Service.ExecStart = "${pkgs.awww}/bin/awww-daemon"; - Install.WantedBy = [ "niri.service" ]; - }; - - systemd.user.services.awww-setter = { - Unit.Description = "Wallpaper service using awww (setter)"; - Unit.Requires = [ "awww-daemon.service" ]; - Unit.After = [ "awww-daemon.service" ]; - Service.Type = "oneshot"; + systemd.user.services.wbg-daemon = { + Unit.Description = "Wallpaper service using wbg (daemon)"; Service.ExecStart = '' - ${pkgs.awww}/bin/awww img \ - %h/.local/share/wallpaper/daily.jpg \ - --transition-step 2 \ - --transition-fps 60 + ${pkgs.wbg}/bin/wbg -s \ + %h/.local/share/wallpaper/daily.jpg ''; + Install.WantedBy = [ "niri.service" ]; }; systemd.user.services.bing-wallpaper = { @@ -55,7 +45,7 @@ ''; } ); - Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart awww-setter.service"; + Service.ExecStartPost = "${pkgs.systemd}/bin/systemctl --user restart wbg-daemon.service"; Install.WantedBy = [ "niri.service" ]; };