diff --git a/flake.lock b/flake.lock index 33d07d4..c39a2e3 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,26 @@ "type": "github" } }, + "awww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2", + "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" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -92,7 +112,7 @@ "caelestia-cli": { "inputs": { "caelestia-shell": "caelestia-shell", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1764208733, @@ -160,7 +180,7 @@ "caelestia-shell_2": { "inputs": { "caelestia-cli": "caelestia-cli_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "quickshell": [ "quickshell" ] @@ -182,7 +202,7 @@ "dankMaterialShell": { "inputs": { "dgop": "dgop", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1764226053, @@ -260,11 +280,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -290,6 +310,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "locked": { "lastModified": 1761640442, "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", @@ -526,9 +562,9 @@ }, "ghostty": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "zig": "zig", "zon2nix": "zon2nix" }, @@ -567,7 +603,7 @@ }, "hexecute": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1762892536, @@ -655,7 +691,7 @@ }, "kimi-cli": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systems": "systems_3", @@ -697,7 +733,7 @@ "mangowc": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "scenefx": "scenefx" }, "locked": { @@ -716,7 +752,7 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1764241545, @@ -758,7 +794,7 @@ "niri-unstable": [ "niri-unstable" ], - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -813,7 +849,7 @@ }, "nix-matlab": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -835,7 +871,7 @@ "nixGL": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1762090880, @@ -981,9 +1017,9 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "lib-aggregate": "lib-aggregate", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1764210015, @@ -1000,6 +1036,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1750386251, + "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1763049705, "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", @@ -1015,7 +1067,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1031,7 +1083,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1746378225, "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", @@ -1046,7 +1098,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1766167171, "narHash": "sha256-byMhqfXhykDuUKSytViHmGXJMBbnblp2MHjpvaYDlqI=", @@ -1062,7 +1114,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1763966396, "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", @@ -1078,7 +1130,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1763618868, "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", @@ -1094,7 +1146,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1763966396, "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", @@ -1110,7 +1162,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1761236834, "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", @@ -1127,6 +1179,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1763934636, + "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1763966396, "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", @@ -1142,7 +1210,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1763678758, "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", @@ -1158,7 +1226,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1762363567, "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", @@ -1174,7 +1242,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 315532800, "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=", @@ -1187,7 +1255,7 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1758360447, "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", @@ -1200,7 +1268,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1759831965, "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", @@ -1216,7 +1284,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1766532406, "narHash": "sha256-acLU/ag9VEoKkzOD202QASX25nG1eArXg5A0mHjKgxM=", @@ -1232,26 +1300,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1750386251, - "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "nuschtosSearch": "nuschtosSearch", "systems": "systems_7" }, @@ -1292,7 +1344,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1764248576, @@ -1451,6 +1503,7 @@ "root": { "inputs": { "agenix": "agenix", + "awww": "awww", "caelestia-cli": "caelestia-cli", "caelestia-shell": "caelestia-shell_2", "dankMaterialShell": "dankMaterialShell", @@ -1467,7 +1520,7 @@ "nix-matlab": "nix-matlab", "nixGL": "nixGL", "nixd": "nixd", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", @@ -1478,6 +1531,27 @@ "treefmt-nix": "treefmt-nix_2" } }, + "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" + } + }, "scenefx": { "inputs": { "nixpkgs": [ @@ -1757,7 +1831,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1762938485, @@ -1862,7 +1936,7 @@ }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index c43d35f..cded8c6 100644 --- a/flake.nix +++ b/flake.nix @@ -102,5 +102,6 @@ }; hexecute.url = "github:ThatOtherAndrew/Hexecute"; kimi-cli.url = "github:MoonshotAI/kimi-cli"; + awww.url = "git+https://codeberg.org/LGFae/awww"; }; } diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index f264102..781b26c 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -13,7 +13,7 @@ # ./mango ]; home.packages = with pkgs; [ - swww + awww swaybg kanshi wlsunset diff --git a/home/programs/desktop/mango/default.nix b/home/programs/desktop/mango/default.nix index b969f1f..0d1aee2 100644 --- a/home/programs/desktop/mango/default.nix +++ b/home/programs/desktop/mango/default.nix @@ -330,7 +330,7 @@ autostart_sh = let setWallpaper = monitor: '' - swww img --namespace background -o ${monitor} ~/Pictures/Wallpapers/generated/$(cat ~/.cache/swww/${monitor} | cut -d'/' -f7 | cut -d'-' -f2- | sd "\-blurred" "") + awww img --namespace background -o ${monitor} ~/Pictures/Wallpapers/generated/$(cat ~/.cache/awww/${monitor} | cut -d'/' -f7 | cut -d'-' -f2- | sd "\-blurred" "") ''; in '' @@ -338,8 +338,8 @@ killall swhks swhks & doas swhkd -c ~/.config/mango/swhkdrc & - swww kill - swww-daemon --namespace background & + awww kill + awww-daemon --namespace background & killall clash-meta clash-meta -d ~/.config/clash & wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 & diff --git a/home/programs/desktop/niri/autostart.nix b/home/programs/desktop/niri/autostart.nix index f451034..6c998fd 100644 --- a/home/programs/desktop/niri/autostart.nix +++ b/home/programs/desktop/niri/autostart.nix @@ -9,7 +9,7 @@ let niri-autostart = pkgs.writeShellApplication { name = "niri-autostart"; runtimeInputs = with pkgs; [ - swww + awww mihomo wlsunset systemd @@ -26,20 +26,20 @@ let killall swhks swhks & doas swhkd -c ~/.config/niri/swhkd/niri.swhkdrc & - swww kill - swww-daemon --namespace "background" & - swww-daemon --namespace "backdrop" & - # swww restore --namespace "background" - # swww restore --namespace "backdrop" + awww kill + awww-daemon --namespace "background" & + awww-daemon --namespace "backdrop" & + # awww restore --namespace "background" + # awww restore --namespace "backdrop" mihomo -d ~/.config/clash & wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 & '' + ( builtins.attrNames config.monitors |> map (monitor: [ - "swww img --namespace background -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-file)\"" + "awww img --namespace background -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-file)\"" "sleep 0.2" - "swww img --namespace backdrop -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-blurred-file)\"" + "awww img --namespace backdrop -o ${monitor} \"/home/${user}/Pictures/Wallpapers/generated/$(cat ~/Pictures/Wallpapers/${monitor}-blurred-file)\"" "sleep 0.2" ]) |> builtins.concatLists diff --git a/home/programs/desktop/niri/default.nix b/home/programs/desktop/niri/default.nix index d5a1ab2..0dcec24 100644 --- a/home/programs/desktop/niri/default.nix +++ b/home/programs/desktop/niri/default.nix @@ -115,7 +115,7 @@ ]; layer-rules = [ { - matches = [ { namespace = "swww-daemonbackdrop"; } ]; + matches = [ { namespace = "awww-daemonbackdrop"; } ]; place-within-backdrop = true; } { diff --git a/home/programs/desktop/scripts/change-wal-niri b/home/programs/desktop/scripts/change-wal-niri index 95f377c..50ebc38 100755 --- a/home/programs/desktop/scripts/change-wal-niri +++ b/home/programs/desktop/scripts/change-wal-niri @@ -6,8 +6,8 @@ if [ -z $wall ]; then exit 1 fi output=$(niri msg -j focused-output | jq -r .name) -swww img -o $output $wallpapers_dir/$wall --transition-type random --transition-duration 1 --namespace background +awww img -o $output $wallpapers_dir/$wall --transition-type random --transition-duration 1 --namespace background blurwall=$(echo $wall | sed 's/\.jpg$/-blurred.jpg/') -swww img -o $output $wallpapers_dir/$blurwall --transition-type fade --namespace backdrop +awww img -o $output $wallpapers_dir/$blurwall --transition-type fade --namespace backdrop echo $wall > $HOME/Pictures/Wallpapers/"$output"-file echo $blurwall > $HOME/Pictures/Wallpapers/"$output"-blurred-file diff --git a/home/programs/desktop/scripts/change-wal-wayland b/home/programs/desktop/scripts/change-wal-wayland index 7104f82..0db89ee 100755 --- a/home/programs/desktop/scripts/change-wal-wayland +++ b/home/programs/desktop/scripts/change-wal-wayland @@ -4,4 +4,4 @@ wall=$(yad --file) if [[ $wall == "" ]]; then exit fi -swww img $wall --transition-type random --transition-duration 1 +awww img $wall --transition-type random --transition-duration 1 diff --git a/overlays/default.nix b/overlays/default.nix index 466ba9c..d51a7a8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -28,7 +28,7 @@ sway = prev.sway.overrideAttrs (oldAttrs: { passthru.providedSessions = [ "scroll" ]; }); - inherit (inputs.nixpkgs-wayland.packages.${final.stdenv.hostPlatform.system}) swww; + inherit (inputs.awww.packages.${final.stdenv.hostPlatform.system}) awww; }; inherit (inputs.niri.overlays) niri;