diff --git a/flake.lock b/flake.lock index 3b52db654..987c21a9e 100644 --- a/flake.lock +++ b/flake.lock @@ -39,24 +39,36 @@ "type": "github" } }, - "aquamarine-patched": { + "aquamarine": { "inputs": { - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] }, "locked": { - "lastModified": 1721782628, - "narHash": "sha256-wesqxweVMb+eNK5Ls07dxROCus7CxWtSQW99mMtQqbA=", - "owner": "sjcobb2022", - "repo": "aquamarine-patched", - "rev": "43e46cb0c47cf4228f44fcd12dd385fd7c09f485", + "lastModified": 1721755137, + "narHash": "sha256-DcJkFNaHGRMIkexx/ol2oNiUFT/zqnZH6dwODdHubIU=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "4c72cd4d0b0368ce78bf94ea7f23d47670f0d429", "type": "github" }, "original": { - "owner": "sjcobb2022", - "repo": "aquamarine-patched", + "owner": "hyprwm", + "repo": "aquamarine", "type": "github" } }, @@ -77,7 +89,7 @@ }, "catppuccin-cursors": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1717893279, @@ -448,7 +460,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1705309234, @@ -504,7 +516,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -522,7 +534,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -540,7 +552,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1710146030, @@ -558,7 +570,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1701680307, @@ -591,7 +603,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1694529238, @@ -609,7 +621,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1710146030, @@ -777,11 +789,11 @@ ] }, "locked": { - "lastModified": 1721714663, - "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=", + "lastModified": 1721804110, + "narHash": "sha256-i4jINRazBKPqlaS+qhlP+kV/UHEq3vs5itfpblqu4ZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82", + "rev": "af70fc502a15d7e1e4c5a4c4fc8e06c2ec561e0c", "type": "github" }, "original": { @@ -864,9 +876,9 @@ "hypridle": { "inputs": { "hyprlang": "hyprlang", - "hyprutils": "hyprutils_2", - "nixpkgs": "nixpkgs_6", - "systems": "systems_5" + "hyprutils": "hyprutils", + "nixpkgs": "nixpkgs_5", + "systems": "systems_4" }, "locked": { "lastModified": 1721332982, @@ -884,23 +896,21 @@ }, "hyprland": { "inputs": { - "aquamarine": [ - "aquamarine-patched" - ], + "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_7", - "systems": "systems_6", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_6", + "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1721774535, - "narHash": "sha256-wdoC7Mahvl8230NY7m3aDIQRe3+7kZBbyKDt8g7h91g=", + "lastModified": 1721831547, + "narHash": "sha256-ueSN0oXsQ9aqA8CGBaJULXxYWap8Zchdp8wzgWTzQe4=", "ref": "refs/heads/main", - "rev": "e2efecc24e6534f46352cab13975778e3f0b5735", - "revCount": 4968, + "rev": "8d3920c882f0587c5b3224135f668dce8bb0b04f", + "revCount": 4973, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1132,12 +1142,12 @@ }, "hyprlang_5": { "inputs": { - "hyprutils": "hyprutils_6", + "hyprutils": "hyprutils_5", "nixpkgs": [ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1717881852, @@ -1156,16 +1166,16 @@ "hyprlock": { "inputs": { "hyprlang": "hyprlang_3", - "hyprutils": "hyprutils_4", - "nixpkgs": "nixpkgs_8", - "systems": "systems_7" + "hyprutils": "hyprutils_3", + "nixpkgs": "nixpkgs_7", + "systems": "systems_6" }, "locked": { - "lastModified": 1721563228, - "narHash": "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=", + "lastModified": 1721822339, + "narHash": "sha256-dkhgyxPxmOI/ZHk/LZRQZAVjtk9kPx2RFQRnuEoXQ4s=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "dba9d8b5175a6f23463035aafc6b0c741f9b73a5", + "rev": "58e1a4a4997728be886a46d031514b3f09763c5d", "type": "github" }, "original": { @@ -1177,10 +1187,10 @@ "hyprpaper": { "inputs": { "hyprlang": "hyprlang_4", - "hyprutils": "hyprutils_5", - "hyprwayland-scanner": "hyprwayland-scanner_3", - "nixpkgs": "nixpkgs_9", - "systems": "systems_8" + "hyprutils": "hyprutils_4", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_8", + "systems": "systems_7" }, "locked": { "lastModified": 1721686135, @@ -1197,31 +1207,6 @@ } }, "hyprutils": { - "inputs": { - "nixpkgs": [ - "aquamarine-patched", - "nixpkgs" - ], - "systems": [ - "aquamarine-patched", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { "inputs": { "nixpkgs": [ "hypridle", @@ -1246,7 +1231,7 @@ "type": "github" } }, - "hyprutils_3": { + "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -1271,7 +1256,7 @@ "type": "github" } }, - "hyprutils_4": { + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -1296,7 +1281,7 @@ "type": "github" } }, - "hyprutils_5": { + "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprpaper", @@ -1321,7 +1306,7 @@ "type": "github" } }, - "hyprutils_6": { + "hyprutils_5": { "inputs": { "nixpkgs": [ "xdg-portal-hyprland", @@ -1349,31 +1334,6 @@ } }, "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "aquamarine-patched", - "nixpkgs" - ], - "systems": [ - "aquamarine-patched", - "systems" - ] - }, - "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -1398,7 +1358,7 @@ "type": "github" } }, - "hyprwayland-scanner_3": { + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprpaper", @@ -1635,22 +1595,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1721562059, "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", @@ -1666,7 +1610,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1682,7 +1626,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1721466660, "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", @@ -1698,7 +1642,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1720031269, "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", @@ -1728,22 +1672,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1716948383, "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", @@ -1759,7 +1687,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1775,7 +1703,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1721138476, "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", @@ -1791,7 +1719,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1721379653, "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", @@ -1807,7 +1735,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1721138476, "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", @@ -1823,7 +1751,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1721138476, "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", @@ -1839,6 +1767,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -1847,15 +1791,15 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721772245, - "narHash": "sha256-//9p3Qm8gLbPUTsSGN2EMYkDwE5Sqq9B9P2X/z2+npw=", + "lastModified": 1721812551, + "narHash": "sha256-XRvi70E7/87VhZzHQSHBbtbAQQizf1hgRdVZkV1X+8c=", "owner": "nix-community", "repo": "nixvim", - "rev": "ab67ee7e8b33e788fc53d26dc6f423f9358e3e66", + "rev": "638729936455e26dcd2a13e25b96ac79891bc9af", "type": "github" }, "original": { @@ -1866,11 +1810,11 @@ }, "nur": { "locked": { - "lastModified": 1721792723, - "narHash": "sha256-/UdX1Jh0bpX6heMjcn4R6QKST+3V5WDT74rcJtYqzPs=", + "lastModified": 1721828726, + "narHash": "sha256-vhhfwcNSVVEpH0C/9i62MlGF6RyspSIObTKIo5KWsiw=", "owner": "nix-community", "repo": "NUR", - "rev": "a5607793a5686955acfc996f5aeb67300927b9b5", + "rev": "2807334afd5d150f55cdcfcff24698609fabdfe8", "type": "github" }, "original": { @@ -1914,7 +1858,7 @@ "inputs": { "flake-compat": "flake-compat_6", "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1935,7 +1879,6 @@ "inputs": { "anyrun": "anyrun", "anyrun-nixos-options": "anyrun-nixos-options", - "aquamarine-patched": "aquamarine-patched", "catppuccin": "catppuccin", "catppuccin-cursors": "catppuccin-cursors", "darwin": "darwin", @@ -1953,7 +1896,7 @@ "nix-index-database": "nix-index-database", "nix-ld-rs": "nix-ld-rs", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixvim": "nixvim", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", @@ -1970,7 +1913,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1714529851, @@ -2129,11 +2072,11 @@ ] }, "locked": { - "lastModified": 1721727694, - "narHash": "sha256-X3qaEUG5zgJi9G1ceLpjuvlC9euTVNGlnJilfCgWJu4=", + "lastModified": 1721794305, + "narHash": "sha256-Sb4v/LAc8Pl0sOZf/LwT3QFZp+MAdtHF3cHswuxQDtQ=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "597ae057680ac250083166efab806dcc2e47dd6b", + "rev": "8056338fca46716159d5d54f59ed04d6cf7b771f", "type": "github" }, "original": { @@ -2218,21 +2161,6 @@ } }, "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_15": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2247,7 +2175,7 @@ "type": "github" } }, - "systems_16": { + "systems_15": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2264,16 +2192,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2294,16 +2222,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2354,16 +2282,16 @@ }, "systems_8": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2405,7 +2333,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -2448,7 +2376,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, @@ -2472,8 +2400,8 @@ "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_5", - "nixpkgs": "nixpkgs_14", - "systems": "systems_16" + "nixpkgs": "nixpkgs_13", + "systems": "systems_15" }, "locked": { "lastModified": 1721755049, diff --git a/flake.nix b/flake.nix index 463ca74f5..2694b67c1 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,6 @@ anyrun.url = "github:anyrun-org/anyrun"; anyrun-nixos-options.url = "github:n3oney/anyrun-nixos-options"; - aquamarine-patched.url = "github:sjcobb2022/aquamarine-patched"; - catppuccin-cursors.url = "github:catppuccin/cursors"; catppuccin.url = "github:catppuccin/nix"; @@ -39,7 +37,6 @@ # Hyprland Section ## hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - hyprland.inputs.aquamarine.follows = "aquamarine-patched"; # hyprland.url = "git+https://github.com/khaneliman/Hyprland?ref=windows&submodules=1"; xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; # Hypridle