From 1eecf897930f2d4d8dd75738976b1f45cf74ed6e Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 15 Jul 2024 21:57:13 +0800 Subject: [PATCH 1/8] feat: update dependencies --- flake.lock | 446 ++++++++++++++++++++++++++++------------------------- flake.nix | 4 +- 2 files changed, 239 insertions(+), 211 deletions(-) diff --git a/flake.lock b/flake.lock index 26d11697..49aaf27b 100644 --- a/flake.lock +++ b/flake.lock @@ -93,22 +93,13 @@ }, "crane_2": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" - ] + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1681177078, @@ -130,15 +121,14 @@ "flake-parts": "flake-parts_2", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs_3", - "pnpm2nix": "pnpm2nix", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1714638472, - "narHash": "sha256-6x/uskMYjtu/0D6DoudhxaVCEdpDoJHBOihlk+oSk/0=", + "lastModified": 1720675195, + "narHash": "sha256-kAOt6JR1PHyvHkLz39ABt3y09di05yJZUS3tELIPofc=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "0ca155a907fb349e286bc0df96fcdc6c31b08844", + "rev": "7915b3bf5cf0a89abcb152a5a9b732f372c68397", "type": "github" }, "original": { @@ -176,11 +166,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -213,11 +203,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1717446130, - "narHash": "sha256-fW+TA5AR9xwRhFHLB2frH3MGlZuL18aRQleg55XGqwA=", + "lastModified": 1721017423, + "narHash": "sha256-eKtkKSEm1bSYrwK5VGiREGDeXNkr6l9vOdiQ3GTMI58=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "517daa4ed9168855c202ba2fd28920f6ee17249f", + "rev": "ba3f30ef67f948438c4b8ec65d502108702be333", "type": "github" }, "original": { @@ -243,6 +233,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -258,7 +264,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -300,11 +306,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -321,11 +327,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -360,11 +366,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -411,14 +417,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -429,14 +435,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -450,11 +456,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -526,11 +532,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -654,11 +660,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -700,26 +706,26 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7", - "wlroots": "wlroots", + "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1713283263, - "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", + "lastModified": 1719317162, + "narHash": "sha256-t3N0VzDJdxchdmHkbGMGqvoxTq/Bm7Y98upU4icPYLY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", + "rev": "918d8340afd652b011b937d29d5eea0be08467f5", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.39.1", + "ref": "v0.41.2", "repo": "Hyprland", "type": "github" } @@ -728,19 +734,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1718746314, + "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", "type": "github" }, "original": { @@ -774,13 +782,63 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1720545076, + "narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1720215857, + "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "impermanence": { "locked": { - "lastModified": 1717932370, - "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", + "lastModified": 1719091691, + "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "owner": "nix-community", "repo": "impermanence", - "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", + "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "type": "github" }, "original": { @@ -792,26 +850,26 @@ "lanzaboote": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", + "lastModified": 1718178907, + "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", + "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.3.0", + "ref": "v0.4.1", "repo": "lanzaboote", "type": "github" } @@ -825,11 +883,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1718198940, - "narHash": "sha256-TKfQP+TYWQ2LGhO4UySZyFscVOA2WZ+2Cqo8GwkIgXE=", + "lastModified": 1720034501, + "narHash": "sha256-fzZpuVnhw5uOtA4OuXw3a+Otpy8C+QV0Uu5XfhGEPSg=", "owner": "astro", "repo": "microvm.nix", - "rev": "02a1fe9237a6539ff83d15443d328e4b0b49a117", + "rev": "a808af7775f508a2afedd1e4940a382fe1194f21", "type": "github" }, "original": { @@ -862,11 +920,11 @@ ] }, "locked": { - "lastModified": 1718345812, - "narHash": "sha256-FJhA+YFsOFrAYe6EaiTEfomNf7jeURaPiG5/+a3DRSc=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ff988d78f2f55641efacdf9a585d2937f7e32a9b", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -883,11 +941,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1705242886, - "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", + "lastModified": 1719227224, + "narHash": "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", + "rev": "32071eb9635dbe0e1e8fc750ea1aac6808272018", "type": "github" }, "original": { @@ -902,11 +960,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1718328127, - "narHash": "sha256-2ldscRIlStuv/fRmifXbvjlMpyVuy8Z9zhiDBRM6oe0=", + "lastModified": 1720920199, + "narHash": "sha256-0dNwRhtUVQha5S+NFeoeMXEt/6v0x56DCdyUk+vEFeY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "2c9a664875b410d12282fed9043f4703b6fdb029", + "rev": "fce565402d5b1ed4e92c4a9dfcd094d0172d8f0b", "type": "github" }, "original": { @@ -924,11 +982,11 @@ ] }, "locked": { - "lastModified": 1701208414, - "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", "type": "github" }, "original": { @@ -939,11 +997,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -975,11 +1033,11 @@ ] }, "locked": { - "lastModified": 1718025593, - "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -1012,11 +1070,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718349360, - "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -1083,11 +1141,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1718146371, - "narHash": "sha256-W3RNddq9jbuaLDzsXeCLrUXOm5U37ecPcuC4ifjmikM=", + "lastModified": 1720970785, + "narHash": "sha256-gRyLiF5ae1822DFjfOp+6+c/sexYz0BmsNGpxYnDUWM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2975732531b5fa6e728f837c6f090335cbef5285", + "rev": "fa4dd14e99394b6888a3913af42a04a9110e3bcc", "type": "github" }, "original": { @@ -1098,24 +1156,6 @@ } }, "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1717284937, "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", @@ -1127,13 +1167,25 @@ "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1718447546, + "narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "842253bf992c3a7157b67600c2857193f126563a", "type": "github" }, "original": { @@ -1161,27 +1213,27 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718376599, - "narHash": "sha256-cTFGqLYTrIxORc673fUUCecQVXiXHDj6Z8vFQ5K4SDg=", + "lastModified": 1721019587, + "narHash": "sha256-ldD1aSHL8scqD/iHIpvtwEEvvi5hUoADfxme4QisHw0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3bac01780f87646b70326db70920902bc4d49fab", + "rev": "f193f9477c985215795687b43a2788ee85ff86b6", "type": "github" }, "original": { @@ -1193,11 +1245,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -1209,11 +1261,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -1225,11 +1277,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717774105, - "narHash": "sha256-HV97wqUQv9wvptiHCb3Y0/YH0lJ60uZ8FYfEOIzYEqI=", + "lastModified": 1720781449, + "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d226935fd75012939397c83f6c385e4d6d832288", + "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", "type": "github" }, "original": { @@ -1273,11 +1325,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -1320,7 +1372,7 @@ "nuenv": { "inputs": { "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1714761851, @@ -1354,36 +1406,14 @@ "type": "github" } }, - "pnpm2nix": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "daeuniverse", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1691661013, - "narHash": "sha256-m7dhwjnDw2U7PDUatHcVJXd8wrDLpIGlQac0im6+0fk=", - "owner": "Ninlives", - "repo": "pnpm2nix", - "rev": "86f8995bbe56a66459b6ca2f790db6272c616e39", - "type": "github" - }, - "original": { - "owner": "Ninlives", - "repo": "pnpm2nix", - "type": "github" - } - }, "polybar-themes": { "flake": false, "locked": { - "lastModified": 1718031670, - "narHash": "sha256-cUr2XWVSYtwjRvSJJoCLAO2yNCUD3AghGMoAvrr4bQo=", + "lastModified": 1719673248, + "narHash": "sha256-zDh8jE6SOeRjAYqXgzAOnu6bo5Om5wJysWUzqw0Wuiw=", "owner": "adi1090x", "repo": "polybar-themes", - "rev": "12a5b207f058ccba865776153f3da40446775790", + "rev": "39c73cc1a993816f0b4fb251d242632fe8c51bb7", "type": "github" }, "original": { @@ -1395,7 +1425,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", "gitignore": "gitignore", "nixpkgs": [ "daeuniverse", @@ -1404,11 +1433,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -1423,10 +1452,7 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", @@ -1483,7 +1509,7 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" @@ -1491,11 +1517,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -1560,6 +1586,28 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721010111, + "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "flake-utils": [ "lanzaboote", @@ -1584,7 +1632,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "flake-utils": "flake-utils_8", "nixpkgs": [ @@ -1714,16 +1762,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" } }, @@ -1744,16 +1792,16 @@ }, "systems_7": { "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" } }, @@ -1796,11 +1844,11 @@ ] }, "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", "type": "github" }, "original": { @@ -1825,29 +1873,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" diff --git a/flake.nix b/flake.nix index 0ad99f75..6e7cf15f 100644 --- a/flake.nix +++ b/flake.nix @@ -60,14 +60,14 @@ }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.3.0"; + url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; }; impermanence.url = "github:nix-community/impermanence"; hyprland = { - url = "github:hyprwm/Hyprland/v0.39.1"; + url = "github:hyprwm/Hyprland/v0.41.2"; inputs.nixpkgs.follows = "nixpkgs"; }; From c29148fc77f7b66cbb2e1d3c2d799117cdf5ccba Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 15 Jul 2024 22:10:07 +0800 Subject: [PATCH 2/8] fix: update flake again to fix lanzaboote's error --- flake.lock | 220 ++++++++++++++--------------------------------------- 1 file changed, 58 insertions(+), 162 deletions(-) diff --git a/flake.lock b/flake.lock index 49aaf27b..7f99e96e 100644 --- a/flake.lock +++ b/flake.lock @@ -93,20 +93,17 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -249,22 +246,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -348,11 +329,11 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -437,42 +418,6 @@ "inputs": { "systems": "systems_7" }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_8" - }, - "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_9" - }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -487,9 +432,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_10" + "systems": "systems_8" }, "locked": { "lastModified": 1701680307, @@ -505,9 +450,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_6": { "inputs": { - "systems": "systems_11" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -554,11 +499,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -690,11 +635,11 @@ ] }, "locked": { - "lastModified": 1713214463, - "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -744,11 +689,11 @@ ] }, "locked": { - "lastModified": 1718746314, - "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -759,6 +704,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -769,11 +718,11 @@ ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -794,11 +743,11 @@ ] }, "locked": { - "lastModified": 1720545076, - "narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -819,11 +768,11 @@ ] }, "locked": { - "lastModified": 1720215857, - "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -850,14 +799,14 @@ "lanzaboote": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1718178907, @@ -876,7 +825,7 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -1104,7 +1053,7 @@ }, "nixos-rk3588": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_5", "nixos-generators": "nixos-generators_2", "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks_2" @@ -1197,16 +1146,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -1229,11 +1178,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721019587, - "narHash": "sha256-ldD1aSHL8scqD/iHIpvtwEEvvi5hUoADfxme4QisHw0=", + "lastModified": 1721041886, + "narHash": "sha256-++QkbIIyDpJygScgIa/QqjJB4uh2k2zelvFgvY9LFGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f193f9477c985215795687b43a2788ee85ff86b6", + "rev": "75686331f0a24b0d04e82db7411777a521f51f4f", "type": "github" }, "original": { @@ -1372,7 +1321,7 @@ "nuenv": { "inputs": { "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1714761851, @@ -1452,7 +1401,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", @@ -1461,11 +1409,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1509,7 +1457,7 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" @@ -1586,28 +1534,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1721010111, - "narHash": "sha256-GuPw2xhJZ+eszIJFu7z7AtqUmirSWPHpxuCpG6dSOic=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "3ef018b6d0f62eb59580a8e9fe141e37bf1d972d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "lanzaboote", @@ -1619,11 +1545,11 @@ ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -1632,9 +1558,9 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1685,36 +1611,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1890,11 +1786,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { From 0ea8548f377dc84fd2c8b9ee5facba7ec7829ffb Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 15 Jul 2024 22:50:44 +0800 Subject: [PATCH 3/8] fix: remove hyprlnad's flake --- flake.lock | 226 +------------------- flake.nix | 7 - home/linux/gui/hyprland/values/hyprland.nix | 3 +- 3 files changed, 10 insertions(+), 226 deletions(-) diff --git a/flake.lock b/flake.lock index 7f99e96e..c55dd349 100644 --- a/flake.lock +++ b/flake.lock @@ -398,7 +398,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -416,7 +416,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -434,7 +434,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1701680307, @@ -452,7 +452,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -619,168 +619,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718450675, - "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1719317162, - "narHash": "sha256-t3N0VzDJdxchdmHkbGMGqvoxTq/Bm7Y98upU4icPYLY=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "918d8340afd652b011b937d29d5eea0be08467f5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.41.2", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1719316102, - "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1719067853, - "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "914f083741e694092ee60a39d31f693d0a6dc734", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1719091691, @@ -1487,7 +1325,6 @@ "doomemacs": "doomemacs", "haumea": "haumea", "home-manager": "home-manager_2", - "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "microvm": "microvm", @@ -1658,16 +1495,16 @@ }, "systems_5": { "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" } }, @@ -1716,21 +1553,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1768,36 +1590,6 @@ "repo": "wallpapers", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718619174, - "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6e7cf15f..4f2dcb1f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,13 +17,11 @@ # substituers will be appended to the default substituters when fetching packages extra-substituters = [ "https://anyrun.cachix.org" - "https://hyprland.cachix.org" "https://nix-gaming.cachix.org" # "https://nixpkgs-wayland.cachix.org" ]; extra-trusted-public-keys = [ "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" # "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ]; @@ -66,11 +64,6 @@ impermanence.url = "github:nix-community/impermanence"; - hyprland = { - url = "github:hyprwm/Hyprland/v0.41.2"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # community wayland nixpkgs # nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; # anyrun - a wayland launcher diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index e54bca1c..1cb1c435 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -1,11 +1,10 @@ { pkgs, lib, - hyprland, nur-ryan4yin, ... }: let - package = hyprland.packages.${pkgs.system}.hyprland; + package = pkgs.hyprland; in { # NOTE: # We have to enable hyprland/i3's systemd user service in home-manager, From 7d6fa4028d2aea7f7f28f024226f54491a8dc349 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 15 Jul 2024 23:23:50 +0800 Subject: [PATCH 4/8] chore: debug hyprland --- home/linux/gui/hyprland/values/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index 1cb1c435..43a7371b 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -4,7 +4,7 @@ nur-ryan4yin, ... }: let - package = pkgs.hyprland; + package = pkgs.hyprland.override {debug = true;}; in { # NOTE: # We have to enable hyprland/i3's systemd user service in home-manager, From b3b55c36d8397f627f6113dc99bb964a462a0f05 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sat, 20 Jul 2024 11:43:16 +0800 Subject: [PATCH 5/8] fix: hyprland - crash --- flake.lock | 89 ++++++++++++--------- flake.nix | 8 +- home/linux/gui/base/note-taking.nix | 4 +- home/linux/gui/hyprland/values/hyprland.nix | 7 +- hosts/idols-ai/default.nix | 2 - modules/nixos/desktop/peripherals.nix | 2 - 6 files changed, 64 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index c55dd349..0b6393dc 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1717576207, - "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", + "lastModified": 1721135360, + "narHash": "sha256-ZhSA0e45UxiOAjEVqkym/aULh0Dt+KHJLNda7bjx9UI=", "owner": "Kirottu", "repo": "anyrun", - "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", + "rev": "c6101a31a80b51e32e96f6a77616b609770172e0", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1721017423, - "narHash": "sha256-eKtkKSEm1bSYrwK5VGiREGDeXNkr6l9vOdiQ3GTMI58=", + "lastModified": 1721356739, + "narHash": "sha256-AW30n1Nr8sbgN6vvyfFmgL7Jh9PwDRYDH0HmVIlsvqs=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ba3f30ef67f948438c4b8ec65d502108702be333", + "rev": "36e7aaa619342eff61b1daf3ac664f94d5272db7", "type": "github" }, "original": { @@ -605,16 +605,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -670,11 +670,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1720034501, - "narHash": "sha256-fzZpuVnhw5uOtA4OuXw3a+Otpy8C+QV0Uu5XfhGEPSg=", + "lastModified": 1721171275, + "narHash": "sha256-GKdodvwT9Suh6V0qJ0N/YWTIADWwto/x3XnFO86iXDs=", "owner": "astro", "repo": "microvm.nix", - "rev": "a808af7775f508a2afedd1e4940a382fe1194f21", + "rev": "36e261aa2c15a4020663cef87905f436b15305f7", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1721270582, + "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec", "type": "github" }, "original": { @@ -747,11 +747,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1720920199, - "narHash": "sha256-0dNwRhtUVQha5S+NFeoeMXEt/6v0x56DCdyUk+vEFeY=", + "lastModified": 1721381874, + "narHash": "sha256-fA78AQqvEUTyPlq7KYkYldAzV9eaGTCs8yj16nJy52U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "fce565402d5b1ed4e92c4a9dfcd094d0172d8f0b", + "rev": "35c551a783b53adae0b9ce81b94cf70e363411fa", "type": "github" }, "original": { @@ -857,11 +857,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721413321, + "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", "type": "github" }, "original": { @@ -928,11 +928,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1720970785, - "narHash": "sha256-gRyLiF5ae1822DFjfOp+6+c/sexYz0BmsNGpxYnDUWM=", + "lastModified": 1721396254, + "narHash": "sha256-IpPVxufZfE8qy9Vp18LBNaDaxQThM4kS3PsFJHxMcdU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa4dd14e99394b6888a3913af42a04a9110e3bcc", + "rev": "83bb0d311cc9b1f6f4c860f4a9b30b8a1466126c", "type": "github" }, "original": { @@ -999,6 +999,22 @@ } }, "nixpkgs-stable_3": { + "locked": { + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1016,11 +1032,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721041886, - "narHash": "sha256-++QkbIIyDpJygScgIa/QqjJB4uh2k2zelvFgvY9LFGw=", + "lastModified": 1721393053, + "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75686331f0a24b0d04e82db7411777a521f51f4f", + "rev": "a0691657e9634cfc001f02995cca394025e3e940", "type": "github" }, "original": { @@ -1064,11 +1080,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1720781449, - "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=", + "lastModified": 1721303309, + "narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5a3d5a1d951344d683b442c0739010b80039db", + "rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed", "type": "github" }, "original": { @@ -1112,16 +1128,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1300,7 +1316,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1721042469, @@ -1337,6 +1353,7 @@ "nixos-rk3588": "nixos-rk3588", "nixpkgs": "nixpkgs_7", "nixpkgs-darwin": "nixpkgs-darwin", + "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", diff --git a/flake.nix b/flake.nix index 4f2dcb1f..51fe4dc4 100644 --- a/flake.nix +++ b/flake.nix @@ -34,9 +34,9 @@ # which represents the GitHub repository URL + branch/commit-id/tag. # Official NixOS package source, using nixos's unstable branch by default - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; - # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # for macos nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; @@ -48,8 +48,8 @@ # home-manager, used for managing user configuration home-manager = { - url = "github:nix-community/home-manager/release-24.05"; - # url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/master"; + # url = "github:nix-community/home-manager/release-24.05"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, diff --git a/home/linux/gui/base/note-taking.nix b/home/linux/gui/base/note-taking.nix index 6afde3e2..5dcfed39 100644 --- a/home/linux/gui/base/note-taking.nix +++ b/home/linux/gui/base/note-taking.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { home.packages = with pkgs; [ # https://joplinapp.org/help/ - joplin # joplin-cli - joplin-desktop + # joplin # joplin-cli + # joplin-desktop ]; } diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index 43a7371b..c6fe9d45 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -4,7 +4,7 @@ nur-ryan4yin, ... }: let - package = pkgs.hyprland.override {debug = true;}; + package = pkgs.hyprland; in { # NOTE: # We have to enable hyprland/i3's systemd user service in home-manager, @@ -29,7 +29,10 @@ in { }; extraConfig = builtins.readFile ../conf/hyprland.conf; # gammastep/wallpaper-switcher need this to be enabled. - systemd.enable = true; + systemd = { + enable = true; + variables = ["--all"]; + }; }; # NOTE: this executable is used by greetd to start a wayland session when system boot up diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index 3748966d..dd0a8b62 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -43,8 +43,6 @@ in { hardware.opengl = { enable = true; - # if hardware.opengl.driSupport is enabled, mesa is installed and provides Vulkan for supported hardware. - driSupport = true; # needed by nvidia-docker driSupport32Bit = true; }; diff --git a/modules/nixos/desktop/peripherals.nix b/modules/nixos/desktop/peripherals.nix index c1a5e609..d1645f91 100644 --- a/modules/nixos/desktop/peripherals.nix +++ b/modules/nixos/desktop/peripherals.nix @@ -24,8 +24,6 @@ }; # rtkit is optional but recommended security.rtkit.enable = true; - # Remove sound.enable or turn it off if you had it set previously, it seems to cause conflicts with pipewire - sound.enable = false; # Disable pulseaudio, it conflicts with pipewire too. hardware.pulseaudio.enable = false; From 385bcd2d870cbd6486b30684426b32d80c988e29 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sat, 20 Jul 2024 11:49:14 +0800 Subject: [PATCH 6/8] chore: update graphics config --- home/base/tui/editors/packages.nix | 2 +- home/linux/gui/base/note-taking.nix | 8 ++++---- hosts/idols-ai/default.nix | 4 ++-- outputs/default.nix | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home/base/tui/editors/packages.nix b/home/base/tui/editors/packages.nix index b82e20d0..3c3a95c6 100644 --- a/home/base/tui/editors/packages.nix +++ b/home/base/tui/editors/packages.nix @@ -62,7 +62,7 @@ lldb #-- python - nodePackages.pyright # python language server + pyright # python language server (python311.withPackages ( ps: with ps; [ diff --git a/home/linux/gui/base/note-taking.nix b/home/linux/gui/base/note-taking.nix index 5dcfed39..0330540a 100644 --- a/home/linux/gui/base/note-taking.nix +++ b/home/linux/gui/base/note-taking.nix @@ -1,7 +1,7 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ +{pkgs-stable, ...}: { + home.packages = with pkgs-stable; [ # https://joplinapp.org/help/ - # joplin # joplin-cli - # joplin-desktop + joplin # joplin-cli + joplin-desktop ]; } diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index dd0a8b62..98dbb352 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -41,10 +41,10 @@ in { }; virtualisation.docker.enableNvidia = true; # for nvidia-docker - hardware.opengl = { + hardware.graphics = { enable = true; # needed by nvidia-docker - driSupport32Bit = true; + enable32Bit = true; }; # This value determines the NixOS release from which the default diff --git a/outputs/default.nix b/outputs/default.nix index 4a6457c1..195bbab6 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -21,11 +21,11 @@ # To use chrome, we need to allow the installation of non-free software config.allowUnfree = true; }; - # pkgs-stable = import inputs.nixpkgs-stable { - # inherit system; - # # To use chrome, we need to allow the installation of non-free software - # config.allowUnfree = true; - # }; + pkgs-stable = import inputs.nixpkgs-stable { + inherit system; + # To use chrome, we need to allow the installation of non-free software + config.allowUnfree = true; + }; }; # This is the args for all the haumea modules in this folder. From 885205d9e36b6bd4919fa95fb53f0f9fe1d34e0a Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sat, 20 Jul 2024 11:52:56 +0800 Subject: [PATCH 7/8] fix: remove non-existent tree sitter --- home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua b/home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua index 518881cc..db05960d 100644 --- a/home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua +++ b/home/base/tui/editors/neovim/nvim/lua/plugins/treesitter.lua @@ -27,7 +27,6 @@ return { "kdl", "csv", "xml", - "vhdl", ---- Misc "diff", From 5e9f98e56dce5685f4a72b77564aebd0d3a7891a Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sat, 20 Jul 2024 12:12:13 +0800 Subject: [PATCH 8/8] fix: anyrun - https://github.com/anyrun-org/anyrun/issues/153 --- home/linux/gui/hyprland/conf/scripts/startup | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/linux/gui/hyprland/conf/scripts/startup b/home/linux/gui/hyprland/conf/scripts/startup index fa6c128c..d49a41f7 100755 --- a/home/linux/gui/hyprland/conf/scripts/startup +++ b/home/linux/gui/hyprland/conf/scripts/startup @@ -1,5 +1,9 @@ #!/usr/bin/env bash +## Fix anyrun +## https://github.com/anyrun-org/anyrun/issues/153 +ln -s $XDG_RUNTIME_DIR/hypr /tmp/hypr + ## Autostart Programs # Kill already running process