switch from awww to wbg, fight over?

This commit is contained in:
Sean Kovacs 2026-02-22 11:54:32 -05:00
commit c5426c573a
Signed by: sckova
GPG key ID: 00F325187C68651A
4 changed files with 8 additions and 88 deletions

62
flake.lock generated
View file

@ -40,28 +40,6 @@
"type": "github" "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": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@ -160,22 +138,6 @@
} }
}, },
"flake-compat_2": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1767039857,
@ -358,7 +320,7 @@
"inputs": { "inputs": {
"cachyos-kernel": "cachyos-kernel", "cachyos-kernel": "cachyos-kernel",
"cachyos-kernel-patches": "cachyos-kernel-patches", "cachyos-kernel-patches": "cachyos-kernel-patches",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
@ -577,7 +539,6 @@
"inputs": { "inputs": {
"aerothemeplasma-nix": "aerothemeplasma-nix", "aerothemeplasma-nix": "aerothemeplasma-nix",
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
"awww": "awww",
"base16": "base16", "base16": "base16",
"base16-discord": "base16-discord", "base16-discord": "base16-discord",
"catppuccin-discord": "catppuccin-discord", "catppuccin-discord": "catppuccin-discord",
@ -599,27 +560,6 @@
"tt-schemes": "tt-schemes" "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": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -86,11 +86,6 @@
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
awww = {
url = "git+https://codeberg.org/LGFae/awww.git";
inputs.nixpkgs.follows = "nixpkgs";
};
openmw = { openmw = {
url = "gitlab:OpenMW/openmw"; url = "gitlab:OpenMW/openmw";
flake = false; flake = false;
@ -119,7 +114,6 @@
nur, nur,
nixvim, nixvim,
apple-silicon, apple-silicon,
awww,
openmw, openmw,
catppuccin-discord, catppuccin-discord,
... ...
@ -163,7 +157,6 @@
niri.overlays.niri niri.overlays.niri
noctalia.overlays.default noctalia.overlays.default
nur.overlays.default nur.overlays.default
awww.overlays.default
(final: prev: { (final: prev: {
openmw-git = openmw; openmw-git = openmw;
catppuccin-discord-git = catppuccin-discord; catppuccin-discord-git = catppuccin-discord;

View file

@ -236,10 +236,7 @@
}; };
} }
{ {
matches = [ matches = [ { namespace = "^wallpaper$"; } ];
{ namespace = "^wpaperd.*"; }
{ namespace = "^awww-daemon"; }
];
place-within-backdrop = true; place-within-backdrop = true;
} }
]; ];

View file

@ -3,23 +3,13 @@
... ...
}: }:
{ {
systemd.user.services.awww-daemon = { systemd.user.services.wbg-daemon = {
Unit.Description = "Wallpaper service using awww (daemon)"; Unit.Description = "Wallpaper service using wbg (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";
Service.ExecStart = '' Service.ExecStart = ''
${pkgs.awww}/bin/awww img \ ${pkgs.wbg}/bin/wbg -s \
%h/.local/share/wallpaper/daily.jpg \ %h/.local/share/wallpaper/daily.jpg
--transition-step 2 \
--transition-fps 60
''; '';
Install.WantedBy = [ "niri.service" ];
}; };
systemd.user.services.bing-wallpaper = { 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" ]; Install.WantedBy = [ "niri.service" ];
}; };