From b7c370721342c805be3ee18e3efa37ffeeb7c347 Mon Sep 17 00:00:00 2001 From: Hung Date: Sat, 1 Apr 2023 23:35:11 -0700 Subject: [PATCH] ^deps and allow htran home to be built --- dev-shell.nix | 2 + flake.lock | 396 ++++++++++++++++++++------ native_configs/neovim/init.lua | 4 +- nix-conf/home-manager/base/shells.nix | 7 +- nix-conf/home-manager/flake.lock | 388 +++++++++++++++++++------ nix-conf/home-manager/flake.nix | 3 +- out-of-tree/nixGL/fetch.py | 5 - overlays.nix | 18 +- 8 files changed, 619 insertions(+), 204 deletions(-) diff --git a/dev-shell.nix b/dev-shell.nix index a2631fe..b94d9fc 100644 --- a/dev-shell.nix +++ b/dev-shell.nix @@ -15,6 +15,8 @@ pkgs.rust4cargo pkgs.sops pkgs.ssh-to-age + pkgs.go + pkgs.gopls ]; shellHook = '' diff --git a/flake.lock b/flake.lock index c2fcd8a..cf9b2d8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1678924180, + "narHash": "sha256-5bwage/7JRiPiDY4wY3+OBiT8abY5f83hss6pQBklz8=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "0888b44843e3c86db9fd56334c7f5261ea00dc19", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "agenix": { "inputs": { "darwin": "darwin", @@ -8,11 +24,11 @@ ] }, "locked": { - "lastModified": 1677969766, - "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", + "lastModified": 1680281360, + "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", "owner": "ryantm", "repo": "agenix", - "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", + "rev": "e64961977f60388dd0b49572bb0fc453b871f896", "type": "github" }, "original": { @@ -24,11 +40,11 @@ "cargo-leptos": { "flake": false, "locked": { - "lastModified": 1678270781, - "narHash": "sha256-gfGjghO3zZQ1tfXevlCjYkEo6c0kOtfL+0U1FKbrdwM=", + "lastModified": 1680094968, + "narHash": "sha256-LWi+KxvtIPP67vNe1Edf7AT8y4nKJ6jawTJtSEpt+4I=", "owner": "leptos-rs", "repo": "cargo-leptos", - "rev": "87ffe4ddab33a498b8b4e53846e6b090fd675628", + "rev": "6512bd2dc891fead2b7ff7f08d26b89789be7682", "type": "github" }, "original": { @@ -61,6 +77,31 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nickel", + "topiary", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -160,6 +201,22 @@ "type": "github" } }, + "flake-compat_6": { + "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-utils": { "locked": { "lastModified": 1678901627, @@ -175,6 +232,36 @@ "type": "github" } }, + "flake-utils_10": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "locked": { "lastModified": 1667395993, @@ -222,11 +309,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -237,11 +324,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -266,6 +353,21 @@ } }, "flake-utils_8": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -305,11 +407,11 @@ "gnmic": { "flake": false, "locked": { - "lastModified": 1679510878, - "narHash": "sha256-Dz3LeQa5Hlf8zsGOoNViDnCv1eyMQvBKHkx6XvnabEQ=", + "lastModified": 1679677474, + "narHash": "sha256-Flzajl4GYPnxlnLAlcR/KzAoPE76jMFBThztAijfPj4=", "owner": "openconfig", "repo": "gnmic", - "rev": "112538558f9745b08e0ad3ccd9a5578191b95819", + "rev": "c1e3239a694da71b3b290bf7805f3d18e84694e6", "type": "github" }, "original": { @@ -320,7 +422,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": "utils_2" }, "locked": { @@ -345,11 +447,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1679480702, - "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=", + "lastModified": 1680389554, + "narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e", + "rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8", "type": "github" }, "original": { @@ -376,7 +478,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1679567394, @@ -402,11 +504,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1679632758, - "narHash": "sha256-h97hY2VrAXlSQZQRp6jR3YYXgwBD3ris/4iyt20/aAA=", + "lastModified": 1680310604, + "narHash": "sha256-2jop/z79HYhmV/hrdGvhjfTMouvzQvNRgFTkPhwWVcg=", "owner": "neovim", "repo": "neovim", - "rev": "a478fd41753a5c094e6c329a3573cbfb32b1c6bf", + "rev": "75e1b1d5c934aa3a12693a7df58795563fb7877e", "type": "github" }, "original": { @@ -423,11 +525,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1679645578, - "narHash": "sha256-gN0mpWiZHhQlEA4/bfMQFuyNSebrm+WoOntDJtm3Npk=", + "lastModified": 1680336751, + "narHash": "sha256-otSdFRXsNyPYOsbo+49vN4UGwZrVoLDrEp0EkyVJ/rY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5974031f4d4cd09ea98f3febce783ba2d32f9c65", + "rev": "d56f32281f4d6d74ce925a99946713dc6b5a0e30", "type": "github" }, "original": { @@ -442,14 +544,15 @@ "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_2", + "topiary": "topiary" }, "locked": { - "lastModified": 1679662069, - "narHash": "sha256-FpPx3B8vMeHB8iixbZUXq+6awFje8fUE8zyhDTgJ+AM=", + "lastModified": 1680275475, + "narHash": "sha256-Aoq+njIRAsparRyTx6LmuqbkJIWVZmrtt3p2aUhv6eM=", "owner": "tweag", "repo": "nickel", - "rev": "e70f4ba786bad673081629dd2f2ecfb87d0b3267", + "rev": "f0854b9992a1af5228fa4828a65c3660966c271c", "type": "github" }, "original": { @@ -461,21 +564,21 @@ "nix-boost": { "inputs": { "cargo-leptos": "cargo-leptos", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "gnmic": "gnmic", "gomod2nix": "gomod2nix", "naersk": "naersk", "nixlib": "nixlib", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "poetry2nix": "poetry2nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_5" }, "locked": { - "lastModified": 1679675754, - "narHash": "sha256-B/jA2C77hCtnBmMbYhel5Bbon4nj1wB1dMacCHm3Hak=", + "lastModified": 1680312007, + "narHash": "sha256-bFjiXGxNKtytv2wWnBwG1TfBpCNl5DYK2pckbXPacsM=", "ref": "refs/heads/master", - "rev": "c9744d6afa55f9c8eddd7847d27a8bb4b702e2e2", - "revCount": 50, + "rev": "2d8e3de16bc41c12a77bfc8721bb1f6a4cd484c5", + "revCount": 51, "type": "git", "url": "https://git.pegasust.com/pegasust/nix-boost.git" }, @@ -484,6 +587,21 @@ "url": "https://git.pegasust.com/pegasust/nix-boost.git" } }, + "nix-filter": { + "locked": { + "lastModified": 1678109515, + "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -506,12 +624,12 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1, - "narHash": "sha256-RkO+8E7MahERHw1C5DNObDjq4xeI+FqaWH9+M7Fv2UE=", + "narHash": "sha256-fPPUpYHcU9od0bdrzHCgbIKDqFs35u+YTt3jKf+EiMQ=", "path": "out-of-tree/nixGL", "type": "path" }, @@ -522,11 +640,11 @@ }, "nixlib": { "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "lastModified": 1679791877, + "narHash": "sha256-tTV1Mf0hPWIMtqyU16Kd2JUBDWvfHlDC9pF57vcbgpQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", + "rev": "cc060ddbf652a532b54057081d5abd6144d01971", "type": "github" }, "original": { @@ -537,11 +655,11 @@ }, "nixlib_2": { "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", "type": "github" }, "original": { @@ -582,6 +700,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1678898370, @@ -598,6 +732,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1658285632, "narHash": "sha256-zRS5S/hoeDGUbO+L95wXG9vJNwsSYcl93XiD0HQBXLk=", @@ -613,13 +763,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1679553901, - "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "type": "github" }, "original": { @@ -627,13 +777,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -643,7 +793,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -659,7 +809,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -674,13 +824,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -689,40 +839,24 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nix-boost", "nixpkgs" ] }, "locked": { - "lastModified": 1679613134, - "narHash": "sha256-C74l+I97ossJGP8/VJYs/YqxIZ6XHqohuuTnjKTNp/8=", - "owner": "pegasust", + "lastModified": 1680134979, + "narHash": "sha256-8LBOnyrk9r1X8LpxZWynIxr97vq8hRqnpo639c2RA40=", + "owner": "nix-community", "repo": "poetry2nix", - "rev": "654b3a8ed543361d5bef4210a0bf467678304c0d", + "rev": "dc8c13ab88db829c1b71e6c794d1b295c8031408", "type": "github" }, "original": { - "owner": "pegasust", + "owner": "nix-community", "repo": "poetry2nix", "type": "github" } @@ -768,8 +902,8 @@ "nix-index-database": "nix-index-database", "nixgl": "nixgl", "nixlib": "nixlib_2", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_4" + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_6" } }, "rust-overlay": { @@ -826,15 +960,25 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": [ + "nickel", + "topiary", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "topiary", + "crane", + "nixpkgs" + ] }, "locked": { - "lastModified": 1679624450, - "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", "type": "github" }, "original": { @@ -845,15 +989,15 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1679624450, - "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "lastModified": 1679106165, + "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", "type": "github" }, "original": { @@ -862,6 +1006,70 @@ "type": "github" } }, + "rust-overlay_5": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1680229280, + "narHash": "sha256-9UoyQCeKUmHcsIdpsAgcz41LAIDkWhI2PhVDjckrpg0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "aa480d799023141e1b9e5d6108700de63d9ad002", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_6": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1680401949, + "narHash": "sha256-s8+b9Zm9osz9oGInNletIFihgXTs9hogw9C/c3MbErs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9b8632040df6f2218fd01bf79c0589379ac39584", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "topiary": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane_2", + "flake-utils": "flake-utils_6", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1680178226, + "narHash": "sha256-EZtmLYPQII8Ma9yH0udqlNjSXiYUg134j+0Srzb4rbM=", + "owner": "tweag", + "repo": "topiary", + "rev": "1af03d77abf6aef3ea36f878554c16619207252b", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "topiary", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1676283394, diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index 8714e02..ee0439a 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -147,12 +147,12 @@ vim.opt.scrolloff = 30; vim.opt.signcolumn = "yes"; vim.opt.colorcolumn = "80"; -vim.opt.background = "light"; +vim.opt.background = "dark"; vim.api.nvim_create_user_command('Dark', function(opts) -- opts: {name, args: str, fargs: Splited, range, ...} ---@type string - local contrast = (opts.args and string.len(opts.args) > 0) and opts.args or vim.g.gruvbox_contrast_dark; + local contrast = (opts.arg; vim.g.gruvbox_contrast_dark = contrast; vim.opt.background = "dark"; end, diff --git a/nix-conf/home-manager/base/shells.nix b/nix-conf/home-manager/base/shells.nix index 2ebb41e..d338b9b 100644 --- a/nix-conf/home-manager/base/shells.nix +++ b/nix-conf/home-manager/base/shells.nix @@ -52,11 +52,10 @@ in }; programs.tmux = { enable = true; - configBeforePlugin = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; - plugins = - let inherit (pkgs.tmuxPlugins) cpu net-speed; - in [ cpu net-speed ]; + # extraConfigBeforePlugin = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; + plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [ cpu net-speed ]; }; + xdg.configFile."tmux/tmux.conf".text = myLib.mkOrder 600 (builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"); programs.exa = { enable = true; enableAliases = true; diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index c257a32..7551fbb 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -1,13 +1,29 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1678924180, + "narHash": "sha256-5bwage/7JRiPiDY4wY3+OBiT8abY5f83hss6pQBklz8=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "0888b44843e3c86db9fd56334c7f5261ea00dc19", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "cargo-leptos": { "flake": false, "locked": { - "lastModified": 1678270781, - "narHash": "sha256-gfGjghO3zZQ1tfXevlCjYkEo6c0kOtfL+0U1FKbrdwM=", + "lastModified": 1680094968, + "narHash": "sha256-LWi+KxvtIPP67vNe1Edf7AT8y4nKJ6jawTJtSEpt+4I=", "owner": "leptos-rs", "repo": "cargo-leptos", - "rev": "87ffe4ddab33a498b8b4e53846e6b090fd675628", + "rev": "6512bd2dc891fead2b7ff7f08d26b89789be7682", "type": "github" }, "original": { @@ -40,6 +56,31 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nickel", + "topiary", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -117,6 +158,22 @@ "type": "github" } }, + "flake-compat_6": { + "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-utils": { "locked": { "lastModified": 1678901627, @@ -132,6 +189,36 @@ "type": "github" } }, + "flake-utils_10": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "locked": { "lastModified": 1667395993, @@ -179,11 +266,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -194,11 +281,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -223,6 +310,21 @@ } }, "flake-utils_8": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -262,11 +364,11 @@ "gnmic": { "flake": false, "locked": { - "lastModified": 1679510878, - "narHash": "sha256-Dz3LeQa5Hlf8zsGOoNViDnCv1eyMQvBKHkx6XvnabEQ=", + "lastModified": 1679677474, + "narHash": "sha256-Flzajl4GYPnxlnLAlcR/KzAoPE76jMFBThztAijfPj4=", "owner": "openconfig", "repo": "gnmic", - "rev": "112538558f9745b08e0ad3ccd9a5578191b95819", + "rev": "c1e3239a694da71b3b290bf7805f3d18e84694e6", "type": "github" }, "original": { @@ -277,7 +379,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": "utils_2" }, "locked": { @@ -302,15 +404,15 @@ "utils": "utils" }, "locked": { - "lastModified": 1679635191, - "narHash": "sha256-Q+wh/pbbugO+9529nrzcNmqDjOk8nQsfW0UhOSOY/HE=", - "owner": "Pegasust", + "lastModified": 1680389554, + "narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=", + "owner": "nix-community", "repo": "home-manager", - "rev": "061335287875a847f622ffeaea8924b020b4a7ba", + "rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8", "type": "github" }, "original": { - "owner": "Pegasust", + "owner": "nix-community", "repo": "home-manager", "type": "github" } @@ -333,7 +435,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1679567394, @@ -359,11 +461,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1679632758, - "narHash": "sha256-h97hY2VrAXlSQZQRp6jR3YYXgwBD3ris/4iyt20/aAA=", + "lastModified": 1680310604, + "narHash": "sha256-2jop/z79HYhmV/hrdGvhjfTMouvzQvNRgFTkPhwWVcg=", "owner": "neovim", "repo": "neovim", - "rev": "a478fd41753a5c094e6c329a3573cbfb32b1c6bf", + "rev": "75e1b1d5c934aa3a12693a7df58795563fb7877e", "type": "github" }, "original": { @@ -380,11 +482,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1679645578, - "narHash": "sha256-gN0mpWiZHhQlEA4/bfMQFuyNSebrm+WoOntDJtm3Npk=", + "lastModified": 1680336751, + "narHash": "sha256-otSdFRXsNyPYOsbo+49vN4UGwZrVoLDrEp0EkyVJ/rY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5974031f4d4cd09ea98f3febce783ba2d32f9c65", + "rev": "d56f32281f4d6d74ce925a99946713dc6b5a0e30", "type": "github" }, "original": { @@ -399,14 +501,15 @@ "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_2", + "topiary": "topiary" }, "locked": { - "lastModified": 1679662069, - "narHash": "sha256-FpPx3B8vMeHB8iixbZUXq+6awFje8fUE8zyhDTgJ+AM=", + "lastModified": 1680275475, + "narHash": "sha256-Aoq+njIRAsparRyTx6LmuqbkJIWVZmrtt3p2aUhv6eM=", "owner": "tweag", "repo": "nickel", - "rev": "e70f4ba786bad673081629dd2f2ecfb87d0b3267", + "rev": "f0854b9992a1af5228fa4828a65c3660966c271c", "type": "github" }, "original": { @@ -418,21 +521,21 @@ "nix-boost": { "inputs": { "cargo-leptos": "cargo-leptos", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "gnmic": "gnmic", "gomod2nix": "gomod2nix", "naersk": "naersk", "nixlib": "nixlib", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "poetry2nix": "poetry2nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_5" }, "locked": { - "lastModified": 1679675754, - "narHash": "sha256-B/jA2C77hCtnBmMbYhel5Bbon4nj1wB1dMacCHm3Hak=", + "lastModified": 1680312007, + "narHash": "sha256-bFjiXGxNKtytv2wWnBwG1TfBpCNl5DYK2pckbXPacsM=", "ref": "refs/heads/master", - "rev": "c9744d6afa55f9c8eddd7847d27a8bb4b702e2e2", - "revCount": 50, + "rev": "2d8e3de16bc41c12a77bfc8721bb1f6a4cd484c5", + "revCount": 51, "type": "git", "url": "https://git.pegasust.com/pegasust/nix-boost.git" }, @@ -441,6 +544,21 @@ "url": "https://git.pegasust.com/pegasust/nix-boost.git" } }, + "nix-filter": { + "locked": { + "lastModified": 1678109515, + "narHash": "sha256-C2X+qC80K2C1TOYZT8nabgo05Dw2HST/pSn6s+n6BO8=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "aa9ff6ce4a7f19af6415fb3721eaa513ea6c763c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -463,12 +581,12 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1, - "narHash": "sha256-RkO+8E7MahERHw1C5DNObDjq4xeI+FqaWH9+M7Fv2UE=", + "narHash": "sha256-fPPUpYHcU9od0bdrzHCgbIKDqFs35u+YTt3jKf+EiMQ=", "path": "./../../out-of-tree/nixGL", "type": "path" }, @@ -479,11 +597,11 @@ }, "nixlib": { "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "lastModified": 1679791877, + "narHash": "sha256-tTV1Mf0hPWIMtqyU16Kd2JUBDWvfHlDC9pF57vcbgpQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", + "rev": "cc060ddbf652a532b54057081d5abd6144d01971", "type": "github" }, "original": { @@ -524,6 +642,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1678898370, @@ -540,6 +674,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1658285632, "narHash": "sha256-zRS5S/hoeDGUbO+L95wXG9vJNwsSYcl93XiD0HQBXLk=", @@ -555,13 +705,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1679553901, - "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "type": "github" }, "original": { @@ -569,13 +719,13 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -585,7 +735,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -601,7 +751,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -616,13 +766,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { @@ -632,40 +782,24 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nix-boost", "nixpkgs" ] }, "locked": { - "lastModified": 1679613134, - "narHash": "sha256-C74l+I97ossJGP8/VJYs/YqxIZ6XHqohuuTnjKTNp/8=", - "owner": "pegasust", + "lastModified": 1680134979, + "narHash": "sha256-8LBOnyrk9r1X8LpxZWynIxr97vq8hRqnpo639c2RA40=", + "owner": "nix-community", "repo": "poetry2nix", - "rev": "654b3a8ed543361d5bef4210a0bf467678304c0d", + "rev": "dc8c13ab88db829c1b71e6c794d1b295c8031408", "type": "github" }, "original": { - "owner": "pegasust", + "owner": "nix-community", "repo": "poetry2nix", "type": "github" } @@ -709,8 +843,8 @@ "nix-boost": "nix-boost", "nix-index-database": "nix-index-database", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_4" + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_6" } }, "rust-overlay": { @@ -767,15 +901,25 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": [ + "nickel", + "topiary", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nickel", + "topiary", + "crane", + "nixpkgs" + ] }, "locked": { - "lastModified": 1679624450, - "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", "type": "github" }, "original": { @@ -786,15 +930,15 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1679624450, - "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "lastModified": 1679106165, + "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", "type": "github" }, "original": { @@ -803,6 +947,70 @@ "type": "github" } }, + "rust-overlay_5": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1680229280, + "narHash": "sha256-9UoyQCeKUmHcsIdpsAgcz41LAIDkWhI2PhVDjckrpg0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "aa480d799023141e1b9e5d6108700de63d9ad002", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_6": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1680401949, + "narHash": "sha256-s8+b9Zm9osz9oGInNletIFihgXTs9hogw9C/c3MbErs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9b8632040df6f2218fd01bf79c0589379ac39584", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "topiary": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane_2", + "flake-utils": "flake-utils_6", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nickel", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1680178226, + "narHash": "sha256-EZtmLYPQII8Ma9yH0udqlNjSXiYUg134j+0Srzb4rbM=", + "owner": "tweag", + "repo": "topiary", + "rev": "1af03d77abf6aef3ea36f878554c16619207252b", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "topiary", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1676283394, diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 7126dca..f12f7a5 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -16,7 +16,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:Pegasust/home-manager"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; flake-utils.url = "github:numtide/flake-utils"; @@ -202,6 +202,7 @@ ]; } nerd_font_module + { base.keepass.enable = pkgs.lib.mkForce false; } ]; extraSpecialArgs = mkModuleArgs { inherit pkgs; diff --git a/out-of-tree/nixGL/fetch.py b/out-of-tree/nixGL/fetch.py index 11d0e3e..b095899 100755 --- a/out-of-tree/nixGL/fetch.py +++ b/out-of-tree/nixGL/fetch.py @@ -5,8 +5,6 @@ import json http = urllib3.PoolManager() dl_dir = http.request("GET", "https://download.nvidia.com/XFree86/Linux-x86_64/") -# print(f"{dl_dir.status=}\n{dl_dir.data=}") - assert (dl_dir.status < 400), "Error probably occurred" def find_versions(dir_html: bytes) -> list[str]: @@ -30,7 +28,6 @@ def find_versions(dir_html: bytes) -> list[str]: return _rec(dir_html, 0, []) versions = find_versions(dl_dir.data) -# print("\n".join(versions)) download_urls = lambda ver: [f"https://download.nvidia.com/XFree86/Linux-x86_64/{ver}/NVIDIA-Linux-x86_64-{ver}.run"] sha256_urls = lambda ver: [f"{url}{dl_ext}" for dl_ext in [".sha256sum", ".sha256"] for url in download_urls(ver)] @@ -46,14 +43,12 @@ none_id = lambda _: None def get_sha256(version: str) -> str | None: for url in sha256_urls(version): res = http.request("GET", url) - # print(f"attempting: {url}") if res.status < 400: return res.data.decode().split()[0] return None fetch_data = [(v, download_urls(v)[0], get_sha256(v)) for v in versions] fetch_data.append(("latest", *fetch_data[-1][1:])) -# print(fetch_data) # now print the JSON object print(json.dumps({ diff --git a/overlays.nix b/overlays.nix index 5a0debb..f57ca24 100644 --- a/overlays.nix +++ b/overlays.nix @@ -5,8 +5,9 @@ flake_input@{ kpcli-py , system , nickel , nix-boost -, ... -}: let +, ... +}: +let kpcli-py = (final: prev: { # use python3.9, which works because of cython somehow? kpcli-py = final.poetry2nix.mkPoetryApplication { @@ -21,8 +22,7 @@ flake_input@{ kpcli-py } ); kpcli = super.kpcli.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [self.setuptools]; - src = old.src; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; }); # ubersmith = super.ubersmith.overridePythonAttrs (old: { @@ -43,7 +43,7 @@ flake_input@{ kpcli-py }; }); - rust = (final: prev: + rust = (final: prev: let nightlyRustWithExts = exts: final.rust-bin.selectLatestNightlyWith ( toolchain: (toolchain.minimal.override { @@ -53,17 +53,19 @@ flake_input@{ kpcli-py # https://rust-lang.github.io/rustup/concepts/profiles.html rust-default-components = [ "rust-docs" "rustfmt" "clippy" ]; rust-dev-components = rust-default-components ++ [ "rust-src" "rust-analyzer" "miri" ]; - in { + in + { rust4devs = nightlyRustWithExts rust-dev-components; rust4cargo = nightlyRustWithExts [ ]; rust4normi = nightlyRustWithExts rust-default-components; - }); + }); nickel = (final: prev: { inherit (flake_input.nickel.packages.${system}) lsp-nls nickel nickelWasm; }); -in [ +in +[ nix-boost.overlays.default nixgl.overlays.default rust-overlay.overlays.default