From c814818418f20c90529327665581d2b573e91a04 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Mon, 22 Jul 2024 19:26:33 +0530 Subject: [PATCH] feat: Update to nix flakes --- flake.lock | 473 ++++++++++++++++++++++++++++++++------------- flake.nix | 4 + linux/hyprland.nix | 6 +- 3 files changed, 346 insertions(+), 137 deletions(-) diff --git a/flake.lock b/flake.lock index 44919f73..54604e3c 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721571743, + "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "cachix-deploy-flake": { "inputs": { "darwin": "darwin", @@ -163,11 +196,11 @@ ] }, "locked": { - "lastModified": 1718474113, - "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", "owner": "ipetkov", "repo": "crane", - "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", "type": "github" }, "original": { @@ -179,7 +212,7 @@ "crane_3": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "music-player", "nixpkgs" @@ -208,11 +241,11 @@ ] }, "locked": { - "lastModified": 1720226507, - "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", + "lastModified": 1720975002, + "narHash": "sha256-1i521ecK2MFg+lxSk9oRx/C0SsdlI6GS6eYT79nA6TA=", "owner": "ipetkov", "repo": "crane", - "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", + "rev": "1791a5b98d2c1bf143ad85469abcfa2426f3f087", "type": "github" }, "original": { @@ -276,7 +309,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "neovim", "nixvim", @@ -299,7 +332,7 @@ }, "devshell_2": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "nixpkgs": [ "nixvim", "nixpkgs" @@ -660,11 +693,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -707,21 +740,6 @@ } }, "flake-utils_11": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { "inputs": { "systems": "systems_12" }, @@ -739,7 +757,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_12": { "inputs": { "systems": "systems_13" }, @@ -757,7 +775,7 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_13": { "inputs": { "systems": "systems_14" }, @@ -775,7 +793,7 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_14": { "inputs": { "systems": "systems_15" }, @@ -830,7 +848,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -847,24 +865,6 @@ } }, "flake-utils_5": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "inputs": { "systems": "systems_7" }, @@ -882,7 +882,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_8" }, @@ -900,7 +900,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { "systems": "systems_9" }, @@ -918,7 +918,7 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { "systems": "systems_10" }, @@ -936,6 +936,21 @@ "type": "github" } }, + "flake-utils_9": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -1011,11 +1026,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -1176,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1720470846, - "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -1219,11 +1234,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -1232,7 +1247,119 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721330371, + "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1721648826, + "narHash": "sha256-Y5vlGe6adpxZndixVQkCA753ZtxdN9QfMQTkWFoCfbc=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "83a5395eaa99fecef777827fff1de486c06b6180", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ], + "systems": [ + "hyprland", + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "hyprutils": [ "hyprlock", @@ -1248,11 +1375,11 @@ ] }, "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -1263,19 +1390,19 @@ }, "hyprlock": { "inputs": { - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1720539811, - "narHash": "sha256-NEaKlvC58B5c47AAYRmp5ayGCFiVMSorwX6CGiNI0oA=", + "lastModified": 1721563228, + "narHash": "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "944caff79ff17259059932f95e03d9433be68af2", + "rev": "dba9d8b5175a6f23463035aafc6b0c741f9b73a5", "type": "github" }, "original": { @@ -1285,6 +1412,31 @@ } }, "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "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": [ "hyprlock", @@ -1296,11 +1448,11 @@ ] }, "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -1309,6 +1461,31 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "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" + } + }, "ironbar": { "inputs": { "crane": "crane", @@ -1319,11 +1496,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1719927553, - "narHash": "sha256-8DBU91zfxyEZF1mCy1qmvA7mb/ee7AwqEUAT6ScJu40=", + "lastModified": 1721405746, + "narHash": "sha256-ug0GSFb0/CIRZ3RE18wCvrNHXhUm8qiJ+W+mHnooQ+U=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "bcaa13deae4e47caa5fffa7fdaa0981af1fec297", + "rev": "73bdff656f09ebedf767c33bd28c5551b3423c44", "type": "github" }, "original": { @@ -1337,7 +1514,6 @@ "crane": "crane_2", "flake-compat": "flake-compat", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -1345,11 +1521,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1719818887, - "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=", + "lastModified": 1721581642, + "narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429", + "rev": "f3b4ade14392861388265e949b7007a8b62e21dc", "type": "github" }, "original": { @@ -1363,7 +1539,7 @@ "advisory-db": "advisory-db", "crane": "crane_3", "fenix": "fenix", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -1576,11 +1752,11 @@ ] }, "locked": { - "lastModified": 1720599442, - "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", + "lastModified": 1721550066, + "narHash": "sha256-wr6sSb+VpXy8HCvBqU6xvhpaARzWUbEK7uN5tLnqYDg=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", + "rev": "33bf7df5bbfcbbb49e6559b0c96c9e3b26d14e58", "type": "github" }, "original": { @@ -1597,11 +1773,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -1615,11 +1791,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1720334033, - "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", + "lastModified": 1721531260, + "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", + "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", "type": "github" }, "original": { @@ -1736,11 +1912,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -1827,11 +2003,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -1899,11 +2075,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1720599498, - "narHash": "sha256-pFnYV+cUln/koTwe9UNzAzHwpdsw90oTMy6PNInkVw8=", + "lastModified": 1721637232, + "narHash": "sha256-jRJeVfI/ZnihQFk+CpqMSCy9+t0/GjhpR72Noce9qzU=", "owner": "nix-community", "repo": "nixvim", - "rev": "34c3c026b4c9ac1cc37eb97313535aace6b6400b", + "rev": "34aa3e00e7f0b0ec44d036f5fbf1dd27825aa77b", "type": "github" }, "original": { @@ -1940,7 +2116,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "neorg": "neorg_2", "neorg-telescope": "neorg-telescope_2", "nixpkgs": [ @@ -1967,7 +2143,7 @@ "norg": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -1988,7 +2164,7 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_10", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -2007,11 +2183,11 @@ }, "nur": { "locked": { - "lastModified": 1720599945, - "narHash": "sha256-7g4dA58n7SLnyc/Iy6eboxb4KTtcxdXBh5pYZ9VJFgU=", + "lastModified": 1721653238, + "narHash": "sha256-GgdBazQSCX3qRBxuw77E5NMmPVnuk7VVVTtTBq9ljvY=", "owner": "nix-community", "repo": "nur", - "rev": "2b1c51b160c4514bae6d4e57dafbce695ada9d38", + "rev": "13379ed4f3e4fe4c9959a0d21fa5c9b016aef653", "type": "github" }, "original": { @@ -2038,7 +2214,7 @@ }, "onepassword-shell-plugins": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_12", "nixpkgs": [ "nixpkgs" ] @@ -2103,11 +2279,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -2141,6 +2317,7 @@ "cachix-deploy-flake": "cachix-deploy-flake", "flake-utils": "flake-utils_3", "home-manager": "home-manager", + "hyprland": "hyprland", "hyprlock": "hyprlock", "ironbar": "ironbar", "lanzaboote": "lanzaboote", @@ -2220,21 +2397,17 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1718504420, - "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", + "lastModified": 1719109180, + "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", + "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "type": "github" }, "original": { @@ -2277,11 +2450,11 @@ ] }, "locked": { - "lastModified": 1720577957, - "narHash": "sha256-RZuzLdB/8FaXaSzEoWLg3au/mtbuH7MGn2LmXUKT62g=", + "lastModified": 1721614891, + "narHash": "sha256-1yGOh8w/yhWAZ2NJR9N/shQ1tx2n9fmGe0XrDE00i9U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a434177dfcc53bf8f1f348a3c39bfb336d760286", + "rev": "424a759557ed4c01cf9dbbf79a714150d64a90ad", "type": "github" }, "original": { @@ -2298,11 +2471,11 @@ ] }, "locked": { - "lastModified": 1720232258, - "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", + "lastModified": 1721010111, + "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", + "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", "type": "github" }, "original": { @@ -2314,7 +2487,7 @@ "subflakes": { "inputs": { "csshacks": "csshacks", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_13", "nixpkgs": [ "nixpkgs" ] @@ -2482,16 +2655,16 @@ }, "systems_5": { "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" } }, @@ -2639,11 +2812,11 @@ ] }, "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { @@ -2652,21 +2825,51 @@ "type": "github" } }, + "xdph": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721648131, + "narHash": "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "663be9cad424b170b28b9fa8a61042d721007f3b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "zjstatus": { "inputs": { "crane": "crane_4", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_14", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1720291207, - "narHash": "sha256-0az2z890pvKAxn2LJaHxWPgpSvbx0DlNbBIZlYyP7Y4=", + "lastModified": 1721054167, + "narHash": "sha256-0ZplHtEXoqytnDExvNoDWoTt1KjcobKVGXv5zmY3jrk=", "owner": "dj95", "repo": "zjstatus", - "rev": "af66be8031cbccf484363fc3efe6c020cd602b1e", + "rev": "924f821cf1a1800baa90a443a7150ca795ad93c7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b6e7962..dffcc72f 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/nur"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprlock = { url = "github:hyprwm/hyprlock"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/linux/hyprland.nix b/linux/hyprland.nix index 580c13f1..67c7b342 100644 --- a/linux/hyprland.nix +++ b/linux/hyprland.nix @@ -3,7 +3,9 @@ device, ... }: { - imports = [../modules/hyprpaper.nix]; + imports = [ + ../modules/hyprpaper.nix + ]; programs.hyprpaper = let wallpapers = import ../utils/wallhaven.nix {inherit pkgs;}; @@ -25,7 +27,7 @@ settings = { source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; - "experimental:explicit_sync" = true; + # "experimental:explicit_sync" = true; monitor = [ # ",preferred,auto,auto" # ",highrr,auto,1"