From cbe238a99d30dfcc7b87db8b707b610d780a23a3 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Sat, 11 Nov 2023 03:16:39 +0300 Subject: [PATCH] upgrade system --- flake.lock | 348 +++++++++++++----------------- profiles/applications/spotify.nix | 7 +- profiles/overlay.nix | 3 +- profiles/workspace/proxy.nix | 2 +- scripts/gen-patch-zen.sh | 2 +- scripts/populate-store.sh | 9 + 6 files changed, 169 insertions(+), 202 deletions(-) create mode 100755 scripts/populate-store.sh diff --git a/flake.lock b/flake.lock index 799e9b6..5b887ea 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1696252780, - "narHash": "sha256-sQEjVzzstiaNLyiFJ19EMwwbDSSNDyQZIbPiLonlDCQ=", + "lastModified": 1698939737, + "narHash": "sha256-AokSuTdhNM6qXShE3LbX+VaC/kEZ9e3WomcgVIXMiLo=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "0c9d93bdb311f7948f9fb0e98d869316d78eec12", + "rev": "2e0c4a4667f9aac0246843d2d8ee530856d4b679", "type": "github" }, "original": { @@ -22,11 +22,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1696674829, - "narHash": "sha256-t+BQGAghYqDaTE2UdU2t8/oYmebBJ2DRi2GAva5agFw=", + "lastModified": 1698959835, + "narHash": "sha256-IfQNepLwoG9qygeDGj5egnLQUR47LOjBV1PFJtt0Z64=", "owner": "arkenfox", "repo": "user.js", - "rev": "f54d632da585a08185c6164017d79315c331181f", + "rev": "29bb5a35f0908143f395b86263746988168c7966", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692225040, - "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=", + "lastModified": 1698258239, + "narHash": "sha256-qnhoYYIJ0L/P7H/f56lQUEvpzNlXh4sxuHpRERV+B44=", "owner": "zhaofengli", "repo": "attic", - "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd", + "rev": "e9918bc6be268da6fa97af6ced15193d8a0421c0", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1695052866, - "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", + "lastModified": 1698921442, + "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=", "owner": "serokell", "repo": "deploy-rs", - "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", + "rev": "660180bbbeae7d60dad5a92b30858306945fd427", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1697058441, - "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=", + "lastModified": 1698243190, + "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=", "owner": "cachix", "repo": "devenv", - "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39", + "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1697073574, - "narHash": "sha256-Np603TUNj+fzQYmaNPS7pmsy52KHq4fpWP5GCpTJ38Y=", + "lastModified": 1698422527, + "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", "owner": "nix-community", "repo": "disko", - "rev": "3c41ae36ff12afbada9396c7d8282c2c74f74e06", + "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", "type": "github" }, "original": { @@ -232,22 +232,7 @@ "original": { "owner": "edolstra", "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" } }, @@ -316,13 +301,12 @@ } }, "flake-compat_6": { - "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -350,11 +334,11 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -366,11 +350,11 @@ "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -384,11 +368,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -402,11 +386,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -572,11 +556,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -690,11 +674,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1698873617, + "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "48b0a30202516e25d9885525fbb200a045f23f26", "type": "github" }, "original": { @@ -714,11 +698,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697151905, - "narHash": "sha256-sfuiRn7D5D2NzDkXXN/DUUcs2d1ddlf3VmzDBzDO2Tk=", + "lastModified": 1698960976, + "narHash": "sha256-dOmu7k5tWSMlqG/5+cz+dKGMDSTZC2Ir8Lw+9udchxo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3a61350286de842c7f1566c38e2b42821080ddf4", + "rev": "ba9e7814b0e02be251ff6172d644de59cf0170de", "type": "github" }, "original": { @@ -759,11 +743,11 @@ ] }, "locked": { - "lastModified": 1696724955, - "narHash": "sha256-7CczVKotC1RJuSyJMxgzUP11Y1txku9JAga5eFxpA+4=", + "lastModified": 1698097178, + "narHash": "sha256-W4W3pAYNpXp0jLZwK0Bxw6R7n2/UYxp+lnT5mD2/xEM=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "72735ae6352085ef842f6ed496889115afd76ce4", + "rev": "d6856adaffb77a9cc1aac3d04d98276eaa5602a4", "type": "github" }, "original": { @@ -835,22 +819,6 @@ "type": "github" } }, - "lowdown-src_3": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "mms": { "inputs": { "flake-compat": "flake-compat_5", @@ -919,19 +887,20 @@ }, "nix-alien": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_6", + "nix-filter": "nix-filter", "nix-index-database": "nix-index-database", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1696941105, - "narHash": "sha256-3qW17J6tCFgQ9ajYUS1amYQNmHEL1rVcXMMclThBplk=", + "lastModified": 1698880645, + "narHash": "sha256-N/kn+brfSaAIsawnJVoeYiJxb0oKfLbdgofaKb7j9lw=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "68b11e13fa73f26899f5e040c9616d64e5fb325b", + "rev": "fe4a4fca70eb99dc0e27c576d01a3feb4e5552e2", "type": "github" }, "original": { @@ -946,11 +915,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1696852288, - "narHash": "sha256-h49uz+/YDRwbusiVx6I3HP9P3UZROIOlwjlYYqRjesE=", + "lastModified": 1698851690, + "narHash": "sha256-RlXHUPajo6MCeFsouWNFRkit+66j693OqokNuXlSWfY=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "169115475ce741cf3443fab79d0a2faa13e9d904", + "rev": "28c130b4830b60dc28e1b46ab7ebbb43ee29743d", "type": "github" }, "original": { @@ -968,11 +937,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696606406, - "narHash": "sha256-cCDMZshU0UC/V8uPVUKr/GD7MTwTVPsQa1pSrmd0YJ8=", + "lastModified": 1698912268, + "narHash": "sha256-sF1d+veVZ84eRe+UqDCAqjOZJwmpzMcMHV117lyKQCs=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "79908fc2a9768ac9b2ad14e8b94f37bb4ee3b71b", + "rev": "1ff0e1beb6ff70419a1269248325417eaae294a9", "type": "github" }, "original": { @@ -981,19 +950,46 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { + "locked": { + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-index-database": { "inputs": { - "nixpkgs": [ - "nix-alien", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1691897365, - "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=", + "lastModified": 1698550809, + "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f4d70d098f066a30c7087144063dca179495f7d6", + "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c", "type": "github" }, "original": { @@ -1004,18 +1000,18 @@ }, "nix-vscode-marketplace": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1697073746, - "narHash": "sha256-069D60IbxFqAAFDlFZuOHtJcvY4AhlEO2VhIQx/BuZM=", + "lastModified": 1698887753, + "narHash": "sha256-6sIAOzMKkXEYnOpNIfoWO+QYCCz5uR/EzDwE+pEVFEc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ca11c9ddf80bcdffbb57e722888cda1832e9f4d7", + "rev": "c6080604ecf7c35da91d96ee0fb2601b20c1f5a1", "type": "github" }, "original": { @@ -1044,28 +1040,6 @@ "type": "github" } }, - "nix_3": { - "inputs": { - "flake-compat": "flake-compat_6", - "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_8", - "nixpkgs-regression": "nixpkgs-regression_3" - }, - "locked": { - "lastModified": 1690219894, - "narHash": "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8=", - "owner": "nixos", - "repo": "nix", - "rev": "a212300a1d9f9c7b0daf19c00c87fc50480f54f4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "2.17.0", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1693701915, @@ -1104,11 +1078,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1151,11 +1125,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1169,11 +1143,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1690881714, - "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e1960bc196baf6881340d53dccb203a951745a2", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -1186,11 +1160,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1697156615, - "narHash": "sha256-SuL4tSq9rQ13ereiSZE1d/XJAZiPSrMhhNLLHGpgq7k=", + "lastModified": 1698964321, + "narHash": "sha256-D1NxAFHjBao+kOVFdZRBKyEu6DCOJmqZWFffwwovcv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca2cecd58dc43fb0f93f0354e1780ad2be1b2c81", + "rev": "96b042bd45c7b730186eaab1dcdf76898b122b03", "type": "github" }, "original": { @@ -1232,22 +1206,6 @@ "type": "github" } }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685004253, @@ -1282,11 +1240,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1698846319, + "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857", "type": "github" }, "original": { @@ -1298,11 +1256,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1696879762, - "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1314,11 +1272,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1692463654, - "narHash": "sha256-F8hZmsQINI+S6UROM4jyxAMbQLtzE44pI8Nk6NtMdao=", + "lastModified": 1697886341, + "narHash": "sha256-AdE67xPty9M9wn36nPVp6aDntIdigrs7UbyaGv1VAaM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783", + "rev": "44881e03af1c730cbb1d72a4d41274a2c957813a", "type": "github" }, "original": { @@ -1426,27 +1384,27 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", - "owner": "NixOS", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.11-small", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1696125185, - "narHash": "sha256-zJTpVLKg5YhbNJdILfBzYGz9zhM4Cjs5ySaD3eVWcTA=", + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0396d3b0fb7f62ddc79a506ad3e6124f01d2ed0a", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", "type": "github" }, "original": { @@ -1458,11 +1416,11 @@ }, "nur": { "locked": { - "lastModified": 1697152430, - "narHash": "sha256-EvKN6W24vITx9a8Bf6bj/SRai8JcSDmJuWm9yviNSoA=", + "lastModified": 1698957866, + "narHash": "sha256-zIqO8lpU4SfxxZf+nhdVq8VrTRbTcBVQnfQ5jCGn6UA=", "owner": "nix-community", "repo": "NUR", - "rev": "9652d4b7c5c05d982e69d1c9df8d05010d431ba0", + "rev": "dda13ca4d5c194dae77889870240eb43ee65dc2e", "type": "github" }, "original": { @@ -1517,11 +1475,11 @@ ] }, "locked": { - "lastModified": 1692274144, - "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", + "lastModified": 1697746376, + "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", + "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", "type": "github" }, "original": { @@ -1532,18 +1490,19 @@ }, "prismlauncher": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "flake-parts": "flake-parts_2", "libnbtplusplus": "libnbtplusplus", + "nix-filter": "nix-filter_2", "nixpkgs": "nixpkgs_11", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1692950933, - "narHash": "sha256-FGV6un1qsk+i991Lxj7Nj85jpBqmaBBy5y3AmpxwIOQ=", + "lastModified": 1698510926, + "narHash": "sha256-clplRTWw19/VS7E16hkcVNgV930sDE1xI6vIiVTd/Z0=", "owner": "AtaraxiaSjel", "repo": "PrismLauncher", - "rev": "094cee8ec61135db4c569a3a72016c9c84c60cdd", + "rev": "083a2145539b4ac0dfb45d9ee750b13de184d5fe", "type": "github" }, "original": { @@ -1593,7 +1552,6 @@ "hyprpaper": "hyprpaper", "impermanence": "impermanence", "mms": "mms", - "nix": "nix_3", "nix-alien": "nix-alien", "nix-direnv": "nix-direnv", "nix-fast-build": "nix-fast-build", @@ -1640,11 +1598,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1697083349, - "narHash": "sha256-oZdlLn1sTDW8LEQ4xQshYW6f6wFAt9kCaFSB0qUh7yE=", + "lastModified": 1698873480, + "narHash": "sha256-FXrGnV4Ml0oo1WSNxwufRL+/oeo62QZoc/vG/uocAEs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0a2aad558c096ea1bbe7db294c3c40fd61db2fa3", + "rev": "7e5f7f04a593676b7395c57d358613b857adab40", "type": "gitlab" }, "original": { @@ -1656,7 +1614,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_9", "nixpkgs": [ "nixpkgs" ], @@ -1665,11 +1623,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1689976554, - "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=", + "lastModified": 1695910380, + "narHash": "sha256-CyzeiXQGm8ceEOSK1dffBCfO7JNp8XhQeNkUiJ5HxgY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e", + "rev": "84783b661ecf33927c534b6476beb74ea3308968", "type": "gitlab" }, "original": { @@ -1806,11 +1764,11 @@ ] }, "locked": { - "lastModified": 1693817438, - "narHash": "sha256-fg3+n4Ky1gCzDtPm0MomMTFw0YkH05Y8ojy5t7bkfHg=", + "lastModified": 1698438538, + "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b8d3a059f5487d6767d07c3716386753e3132d9f", + "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", "type": "github" }, "original": { @@ -1889,18 +1847,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1697909146, + "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", "type": "gitlab" } }, @@ -1920,11 +1878,11 @@ ] }, "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", + "lastModified": 1697981233, + "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", + "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", "type": "github" }, "original": { diff --git a/profiles/applications/spotify.nix b/profiles/applications/spotify.nix index 410bc9b..f23e6c7 100644 --- a/profiles/applications/spotify.nix +++ b/profiles/applications/spotify.nix @@ -2,11 +2,12 @@ home-manager.users.${config.mainuser}.home.packages = with pkgs; [ spotifywm ]; + startupApplications = [ - "${pkgs.spotifywm}/bin/spotifywm" + "${pkgs.spotifywm}/bin/spotify" ]; - + persist.state.homeDirectories = [ ".config/spotify" ]; -} \ No newline at end of file +} diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 4c3788a..f6c42e4 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -39,8 +39,7 @@ with lib; { steam = prev.steam.override { extraPkgs = pkgs: with pkgs; [ mono libkrb5 keyutils ]; }; - spotifywm = prev.spotifywm.override { spotify = pkgs.spotify-spotx; }; - intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; + intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; }; neatvnc = prev.neatvnc.overrideAttrs (oa: { patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ]; diff --git a/profiles/workspace/proxy.nix b/profiles/workspace/proxy.nix index 4133945..3f78075 100644 --- a/profiles/workspace/proxy.nix +++ b/profiles/workspace/proxy.nix @@ -54,7 +54,7 @@ require_nolog = true; require_nofilter = true; block_ipv6 = true; - bootstrap_resolvers = [ "9.9.9.11:53" "9.9.9.9:53" ]; + bootstrap_resolvers = [ "9.9.9.9:53" "149.112.112.112:53" ]; sources = { public-resolvers = { urls = [ diff --git a/scripts/gen-patch-zen.sh b/scripts/gen-patch-zen.sh index eafb4de..873f3ae 100755 --- a/scripts/gen-patch-zen.sh +++ b/scripts/gen-patch-zen.sh @@ -4,7 +4,7 @@ set -eu -o pipefail kCONFIG="$(pwd)" kNIXPKGS=$(nix flake metadata --json --inputs-from . nixpkgs | jq -r '.path') -kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/unstable.nix` +kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/stable.nix` echo "found version: $kMAX_VER" diff --git a/scripts/populate-store.sh b/scripts/populate-store.sh new file mode 100755 index 0000000..333dc76 --- /dev/null +++ b/scripts/populate-store.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +while read p; +do + nix-store --keep-going --ignore-unknown -r "$p" & + # echo "$p" + [ $( jobs | wc -l ) -ge $( nproc ) ] && wait +done < "$1" +wait