From 20f89ebde7486eb8197666789f656a6f45282bb1 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 20 Apr 2024 12:26:38 +0200 Subject: [PATCH] Fix hyprland dri issues --- flake.lock | 280 +++++++++++++++++++--------------------- flake.nix | 10 +- system/nix/nh.nix | 10 +- system/services/gpg.nix | 4 +- 4 files changed, 140 insertions(+), 164 deletions(-) diff --git a/flake.lock b/flake.lock index 460cfd5..288a8e2 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1712834339, - "narHash": "sha256-gRYAbyxx4Z2s4hMoXHSu3wv2+VSiiR2Nk+AZmCZ6kc4=", + "lastModified": 1713301451, + "narHash": "sha256-LzYVqEukjOJjm4HGFe6rtHBiuJxAyPqd2MY1k5ci9QU=", "owner": "Aylur", "repo": "ags", - "rev": "c13bcba224f9ecaaa2f22b1d2895bb62e8face19", + "rev": "33bcaf34d5277031ecb97047fb8ddd44abd8d80e", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1713138971, - "narHash": "sha256-GDHDV/DUMCDWQqhKpM2neLywzpiczdyQSwHg6SFdv08=", + "lastModified": 1713552048, + "narHash": "sha256-RcDJNnxjG9MTQHV/yG7JwPzffFub0JrwP2C1m6LxWFc=", "owner": "catppuccin", "repo": "nix", - "rev": "2f2a820aa7773231516e01df3bfeffda3794af47", + "rev": "29bd8a3bda02434bf6ee3edf9ea6edd360a9ce17", "type": "github" }, "original": { @@ -132,12 +132,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1713178514, - "narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=", - "rev": "546bfa46a80292e800d2767db90170d64d92c200", - "revCount": 1077, + "lastModified": 1713554347, + "narHash": "sha256-Li6DK5JqKesOhTBwSoqxWzOxUR0pcPxE/L7vVyEsZpM=", + "rev": "72c35184e8260a612b00977d0bb26d63cb385cb0", + "revCount": 1090, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1077%2Brev-546bfa46a80292e800d2767db90170d64d92c200/018ee16b-cc43-7638-adcd-ebfa7f6da4f3/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1090%2Brev-72c35184e8260a612b00977d0bb26d63cb385cb0/018ef7cf-24c3-7fe0-97c6-2c445aff88a6/source.tar.gz" }, "original": { "type": "tarball", @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1712765734, - "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", + "lastModified": 1713379868, + "narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", + "rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", "type": "github" }, "original": { @@ -471,7 +471,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1710146030, @@ -489,7 +489,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1685518550, @@ -597,11 +597,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1713054897, - "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=", + "lastModified": 1713576311, + "narHash": "sha256-TUcrgZcMCpGjtwKRA8bSdBsSoFxSErN/uf283ZTKyc0=", "owner": "helix-editor", "repo": "helix", - "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd", + "rev": "211f3680649a697270161bdff8e5b3263aaa8d98", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1713166971, - "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", + "lastModified": 1713566308, + "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", + "rev": "057117a401a34259c9615ce62218aea7afdee4d3", "type": "github" }, "original": { @@ -638,16 +638,17 @@ ] }, "locked": { - "lastModified": 1702537497, - "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=", - "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9", - "revCount": 3192, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz" + "lastModified": 1713524465, + "narHash": "sha256-T1ZUTzBv5QHjus49MpKk/KJ8LEyJI1g+2NhwUhRT6bY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "b1a5b3d6a524c80c7dd20888bff227d52adf5f03", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz" + "owner": "nix-community", + "repo": "home-manager", + "type": "github" } }, "hyprcursor": { @@ -666,11 +667,11 @@ ] }, "locked": { - "lastModified": 1712434681, - "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", + "lastModified": 1713214463, + "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", + "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", "type": "github" }, "original": { @@ -683,14 +684,14 @@ "inputs": { "hyprlang": "hyprlang", "nixpkgs": "nixpkgs_4", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1712947995, - "narHash": "sha256-rROseP9x/qt2H7H9L5KojUIPXwcw03dNjatPiP8yILE=", + "lastModified": 1713472482, + "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", "owner": "hyprwm", "repo": "hypridle", - "rev": "72a6b38b15072ab7df64ae863fc8a4a0f94baf5d", + "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", "type": "github" }, "original": { @@ -704,17 +705,19 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_5", - "systems": "systems_6", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_7", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713143145, - "narHash": "sha256-6lcGyN2Tyucw3o1M5CRlX5cElN7Xz8LNKnrPYvHeS6Q=", + "lastModified": 1713576016, + "narHash": "sha256-myIH+dRrr4PX8CEeWqHY+FsV86yxqaux7uDw1JPbly8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1719905e7fdb42516566fb95c07c6572d5fe6ce5", + "rev": "10caa03ce5bc2ce8238c494d59405213d32ddead", "type": "github" }, "original": { @@ -755,11 +758,11 @@ ] }, "locked": { - "lastModified": 1712836056, - "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "lastModified": 1713607544, + "narHash": "sha256-nbqQmhvYbDVC/5YiZLSGj5r14cOk2k6TGPpP2TtCfhI=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "rev": "9971fec974a9d94a2a1b1d68d5ada5fc59fec053", "type": "github" }, "original": { @@ -798,14 +801,15 @@ "nixpkgs": [ "hypridle", "nixpkgs" - ] + ], + "systems": "systems_5" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -826,11 +830,11 @@ ] }, "locked": { - "lastModified": 1711671891, - "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c1402612146ba06606ebf64963a02bc1efe11e74", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -845,14 +849,14 @@ "hyprlock", "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -863,8 +867,8 @@ }, "hyprlang_4": { "inputs": { - "nixpkgs": "nixpkgs_7", - "systems": "systems_9" + "nixpkgs": "nixpkgs_6", + "systems": "systems_10" }, "locked": { "lastModified": 1711250455, @@ -883,15 +887,15 @@ "hyprlock": { "inputs": { "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_6", - "systems": "systems_8" + "nixpkgs": "nixpkgs_5", + "systems": "systems_9" }, "locked": { - "lastModified": 1713015486, - "narHash": "sha256-hbLGAdWXnDyrnUc2+ShoSbOiBgfl5ESx+4agrjjivsM=", + "lastModified": 1713552491, + "narHash": "sha256-qsXB8swg2FkVRYx8FdD28iXQsz5Pyd0hxV8pnyI49aI=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "04267a5f83a7cd94a2e219d22b139c72ed718182", + "rev": "307e473759d1268b50a087095cc005c941f3bb0d", "type": "github" }, "original": { @@ -903,8 +907,8 @@ "hyprpaper": { "inputs": { "hyprlang": "hyprlang_4", - "nixpkgs": "nixpkgs_8", - "systems": "systems_10" + "nixpkgs": "nixpkgs_7", + "systems": "systems_11" }, "locked": { "lastModified": 1712919696, @@ -929,11 +933,11 @@ ] }, "locked": { - "lastModified": 1712909442, - "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", + "lastModified": 1713333160, + "narHash": "sha256-iz4Uz3vykqsZwIY2hxEMfRrc1DvBgxHVCfSxppuj40s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", + "rev": "d3ce25a385ec7ed899ffb282d1e54ccb4ac9ef0d", "type": "github" }, "original": { @@ -955,11 +959,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712983637, - "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=", + "lastModified": 1713499612, + "narHash": "sha256-IpvUlRDZkBXstPGwB1HDQWHwsUCUGybViAqD6G6siLc=", "owner": "martinvonz", "repo": "jj", - "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d", + "rev": "449fc423b864e5b83043b93f80114a793b05a9f2", "type": "github" }, "original": { @@ -996,16 +1000,16 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1712261512, - "narHash": "sha256-qsBZ3tJj/3LR8jNYyCKjyCe0ePj4cMynSWBMC1OEDtc=", + "lastModified": 1713369831, + "narHash": "sha256-G4OGxvlIIjphpkxcRAkf1QInYsAeqbfNh6Yl1JLy2uM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "999c0cb03f748fe311bca78961dbf0562dc91659", + "rev": "850f27322239f8cfa56b122cc9a278ab99a49015", "type": "github" }, "original": { @@ -1035,26 +1039,6 @@ "type": "github" } }, - "nh": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712645404, - "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=", - "owner": "viperML", - "repo": "nh", - "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, "niri": { "inputs": { "crane": [ @@ -1079,11 +1063,11 @@ ] }, "locked": { - "lastModified": 1712992043, - "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=", + "lastModified": 1713523626, + "narHash": "sha256-BJX9d+IXZsmfiOyZv3n3ujom/q5iEvisxNTtoZ8MYRk=", "owner": "YaLTeR", "repo": "niri", - "rev": "71be19b234d58f4ec447e921633506beb81a52c0", + "rev": "b98b95883def5cd726c1e96a006f9cd7498d1730", "type": "github" }, "original": { @@ -1112,7 +1096,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1713173715, @@ -1253,27 +1237,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -1285,12 +1253,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", - "revCount": 611350, + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "revCount": 612742, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.611350%2Brev-cfd6b5fc90b15709b780a5a1619695a88505a176/018eddfc-e6d9-74bb-a823-20f2ae60079b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.612742%2Brev-66adc1e47f8784803f2deb6cacd5e07264ec2d5c/018ef4da-799e-77b2-85e0-021f668dcfe1/source.tar.gz" }, "original": { "type": "tarball", @@ -1315,11 +1283,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1331,11 +1299,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1347,11 +1315,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -1363,11 +1331,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -1379,32 +1347,32 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711297276, + "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1711297276, - "narHash": "sha256-KtHBr73Z729krfueBV6pUsEyq/4vILGP77DPmrKOTrI=", + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d41d1087707826b3a90685ab69147f8dc8145d5", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1487,10 +1455,9 @@ "kmonad": "kmonad", "lanzaboote": "lanzaboote", "matugen": "matugen", - "nh": "nh", "nix-gaming": "nix-gaming", "nix-index-db": "nix-index-db", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nixpkgs-howdy": "nixpkgs-howdy", "pre-commit-hooks": "pre-commit-hooks", "spicetify-nix": "spicetify-nix" @@ -1642,6 +1609,21 @@ } }, "systems_11": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_12": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1656,7 +1638,7 @@ "type": "github" } }, - "systems_12": { + "systems_13": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1828,11 +1810,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713214484, + "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 65ef5dc..2077312 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,10 @@ hypridle.url = "github:hyprwm/hypridle"; - hyprland.url = "github:hyprwm/Hyprland"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland-contrib = { url = "github:hyprwm/contrib"; @@ -105,11 +108,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-index-db = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/system/nix/nh.nix b/system/nix/nh.nix index 6d7e63e..727bb19 100644 --- a/system/nix/nh.nix +++ b/system/nix/nh.nix @@ -1,17 +1,11 @@ {inputs, ...}: { - imports = [ - inputs.nh.nixosModules.default - ]; - - # nh default flake - environment.variables.FLAKE = "/home/amadejk/Documents/dotfiles"; - - nh = { + programs.nh = { enable = true; # weekly cleanup clean = { enable = true; extraArgs = "--keep-since 7d"; }; + flake = "/home/amadejk/Documents/dotfiles"; }; } diff --git a/system/services/gpg.nix b/system/services/gpg.nix index 1e5bdeb..91068a9 100644 --- a/system/services/gpg.nix +++ b/system/services/gpg.nix @@ -3,7 +3,8 @@ pcscd.enable = true; udev.packages = [pkgs.yubikey-personalization]; - udev.extraRules = '' + /* + udev.extraRules = '' ACTION=="remove",\ ENV{ID_BUS}=="usb",\ ENV{ID_MODEL_ID}=="0407",\ @@ -11,6 +12,7 @@ ENV{ID_VENDOR}=="Yubico",\ RUN+="${pkgs.systemd}/bin/loginctl lock-sessions" ''; + */ # pinentry fix dbus.packages = with pkgs; [