diff --git a/flake.lock b/flake.lock index 8512316..c2fcd8a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "cargo-leptos": { + "flake": false, + "locked": { + "lastModified": 1678270781, + "narHash": "sha256-gfGjghO3zZQ1tfXevlCjYkEo6c0kOtfL+0U1FKbrdwM=", + "owner": "leptos-rs", + "repo": "cargo-leptos", + "rev": "87ffe4ddab33a498b8b4e53846e6b090fd675628", + "type": "github" + }, + "original": { + "owner": "leptos-rs", + "repo": "cargo-leptos", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat_3", @@ -128,6 +144,22 @@ "type": "github" } }, + "flake-compat_5": { + "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, @@ -189,6 +221,21 @@ } }, "flake-utils_5": { + "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_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -203,7 +250,22 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { + "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_8": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -240,6 +302,41 @@ "type": "github" } }, + "gnmic": { + "flake": false, + "locked": { + "lastModified": 1679510878, + "narHash": "sha256-Dz3LeQa5Hlf8zsGOoNViDnCv1eyMQvBKHkx6XvnabEQ=", + "owner": "openconfig", + "repo": "gnmic", + "rev": "112538558f9745b08e0ad3ccd9a5578191b95819", + "type": "github" + }, + "original": { + "owner": "openconfig", + "repo": "gnmic", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -277,6 +374,24 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1679567394, + "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", + "owner": "nix-community", + "repo": "naersk", + "rev": "88cd22380154a2c36799fe8098888f0f59861a15", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils_2", @@ -287,11 +402,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1679556473, - "narHash": "sha256-1kABkonN3VFGTUqb5vKCd5vrU182FGKww67KdnZ6QdQ=", + "lastModified": 1679632758, + "narHash": "sha256-h97hY2VrAXlSQZQRp6jR3YYXgwBD3ris/4iyt20/aAA=", "owner": "neovim", "repo": "neovim", - "rev": "ea0b66d208dbcd5d5c0a17810596d769c7a0b6dd", + "rev": "a478fd41753a5c094e6c329a3573cbfb32b1c6bf", "type": "github" }, "original": { @@ -308,11 +423,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1679559242, - "narHash": "sha256-2qQlbQPLRLmMgbFsY48qnMmgBlCsN9onqpZHx6DPXG0=", + "lastModified": 1679645578, + "narHash": "sha256-gN0mpWiZHhQlEA4/bfMQFuyNSebrm+WoOntDJtm3Npk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "583c7d315e87975b3a226cafd3ac099b8fdd0b6b", + "rev": "5974031f4d4cd09ea98f3febce783ba2d32f9c65", "type": "github" }, "original": { @@ -330,11 +445,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1679605987, - "narHash": "sha256-EWkCsAQiC7B3v9FqNmtxYARX3EDAA1hD8b+9s19cuCs=", + "lastModified": 1679662069, + "narHash": "sha256-FpPx3B8vMeHB8iixbZUXq+6awFje8fUE8zyhDTgJ+AM=", "owner": "tweag", "repo": "nickel", - "rev": "985d19c12387f2175f902b449fc9503c4ee4d5be", + "rev": "e70f4ba786bad673081629dd2f2ecfb87d0b3267", "type": "github" }, "original": { @@ -343,6 +458,32 @@ "type": "github" } }, + "nix-boost": { + "inputs": { + "cargo-leptos": "cargo-leptos", + "flake-compat": "flake-compat_5", + "gnmic": "gnmic", + "gomod2nix": "gomod2nix", + "naersk": "naersk", + "nixlib": "nixlib", + "nixpkgs": "nixpkgs_5", + "poetry2nix": "poetry2nix", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1679675754, + "narHash": "sha256-B/jA2C77hCtnBmMbYhel5Bbon4nj1wB1dMacCHm3Hak=", + "ref": "refs/heads/master", + "rev": "c9744d6afa55f9c8eddd7847d27a8bb4b702e2e2", + "revCount": 50, + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost.git" + }, + "original": { + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost.git" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -365,8 +506,8 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1, @@ -394,6 +535,21 @@ "type": "github" } }, + "nixlib_2": { + "locked": { + "lastModified": 1679187309, + "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "44214417fe4595438b31bdb9469be92536a61455", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1671983799, @@ -442,6 +598,68 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1658285632, + "narHash": "sha256-zRS5S/hoeDGUbO+L95wXG9vJNwsSYcl93XiD0HQBXLk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5342fc6fb59d0595d26883c3cadff16ce58e44f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1679553901, + "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1679437018, + "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "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_7": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -456,7 +674,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { "lastModified": 1679437018, "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", @@ -471,7 +689,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -487,6 +705,28 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nix-boost", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679613134, + "narHash": "sha256-C74l+I97ossJGP8/VJYs/YqxIZ6XHqohuuTnjKTNp/8=", + "owner": "pegasust", + "repo": "poetry2nix", + "rev": "654b3a8ed543361d5bef4210a0bf467678304c0d", + "type": "github" + }, + "original": { + "owner": "pegasust", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -524,11 +764,12 @@ "kpcli-py": "kpcli-py", "neovim-nightly-overlay": "neovim-nightly-overlay", "nickel": "nickel", + "nix-boost": "nix-boost", "nix-index-database": "nix-index-database", "nixgl": "nixgl", - "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay_3" + "nixlib": "nixlib_2", + "nixpkgs": "nixpkgs_8", + "rust-overlay": "rust-overlay_4" } }, "rust-overlay": { @@ -586,7 +827,26 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1679624450, + "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1679624450, @@ -616,6 +876,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 28f6851..0cdf8e7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ nixConfig = { accept-flake-config = true; experimental-features = "nix-command flakes"; - max-jobs = 4; + max-jobs = 12; }; description = "My personal configuration in Nix (and some native configurations)"; inputs = { @@ -38,6 +38,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nickel.url = "github:tweag/nickel"; + nix-boost.url = "git+https://git.pegasust.com/pegasust/nix-boost.git"; }; outputs = diff --git a/nix-conf/home-manager/base/shells.nix b/nix-conf/home-manager/base/shells.nix index 08e24c9..2ebb41e 100644 --- a/nix-conf/home-manager/base/shells.nix +++ b/nix-conf/home-manager/base/shells.nix @@ -52,7 +52,7 @@ in }; programs.tmux = { enable = true; - extraConfig = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; + configBeforePlugin = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; plugins = let inherit (pkgs.tmuxPlugins) cpu net-speed; in [ cpu net-speed ]; diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 949c824..c257a32 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "cargo-leptos": { + "flake": false, + "locked": { + "lastModified": 1678270781, + "narHash": "sha256-gfGjghO3zZQ1tfXevlCjYkEo6c0kOtfL+0U1FKbrdwM=", + "owner": "leptos-rs", + "repo": "cargo-leptos", + "rev": "87ffe4ddab33a498b8b4e53846e6b090fd675628", + "type": "github" + }, + "original": { + "owner": "leptos-rs", + "repo": "cargo-leptos", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": "flake-compat_3", @@ -11,11 +27,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1677892403, - "narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=", + "lastModified": 1678152261, + "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", "owner": "ipetkov", "repo": "crane", - "rev": "105e27adb70a9890986b6d543a67761cbc1964a2", + "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", "type": "github" }, "original": { @@ -85,13 +101,29 @@ "type": "github" } }, + "flake-compat_5": { + "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": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -132,11 +164,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -146,6 +178,21 @@ } }, "flake-utils_5": { + "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_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -160,7 +207,22 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { + "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_8": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -197,6 +259,41 @@ "type": "github" } }, + "gnmic": { + "flake": false, + "locked": { + "lastModified": 1679510878, + "narHash": "sha256-Dz3LeQa5Hlf8zsGOoNViDnCv1eyMQvBKHkx6XvnabEQ=", + "owner": "openconfig", + "repo": "gnmic", + "rev": "112538558f9745b08e0ad3ccd9a5578191b95819", + "type": "github" + }, + "original": { + "owner": "openconfig", + "repo": "gnmic", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -205,15 +302,15 @@ "utils": "utils" }, "locked": { - "lastModified": 1678571066, - "narHash": "sha256-MrlMr2A3tK1MY/JUGWMVzMwois8+mHWXm/1yYdwQSIc=", - "owner": "nix-community", + "lastModified": 1679635191, + "narHash": "sha256-Q+wh/pbbugO+9529nrzcNmqDjOk8nQsfW0UhOSOY/HE=", + "owner": "Pegasust", "repo": "home-manager", - "rev": "bf5712c5865e543fb3f4796511d4cf51efd841b1", + "rev": "061335287875a847f622ffeaea8924b020b4a7ba", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Pegasust", "repo": "home-manager", "type": "github" } @@ -221,11 +318,11 @@ "kpcli-py": { "flake": false, "locked": { - "lastModified": 1619087457, - "narHash": "sha256-iRNLq5s2WJJHwB4beP5xQDKrBPWS/42s/ozLoSa5gAE=", + "lastModified": 1679142558, + "narHash": "sha256-l18PBzf/P7d3BPcFb5gSDX863MsC7S747qooyg0u2lA=", "owner": "rebkwok", "repo": "kpcli", - "rev": "e4d699e3b3d28887f74185f8fa69d0aade111d84", + "rev": "1c64e7274345d28ebc2607e22211a4ee9f6dbe7f", "type": "github" }, "original": { @@ -234,6 +331,24 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1679567394, + "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", + "owner": "nix-community", + "repo": "naersk", + "rev": "88cd22380154a2c36799fe8098888f0f59861a15", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils_2", @@ -244,11 +359,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1678516523, - "narHash": "sha256-DpcG4CT542aSmLmK7bmZFumKfMwBQowWrJns895TvyU=", + "lastModified": 1679632758, + "narHash": "sha256-h97hY2VrAXlSQZQRp6jR3YYXgwBD3ris/4iyt20/aAA=", "owner": "neovim", "repo": "neovim", - "rev": "236c20795eb9f11e21e0719b735ea741711acc08", + "rev": "a478fd41753a5c094e6c329a3573cbfb32b1c6bf", "type": "github" }, "original": { @@ -265,11 +380,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1678522422, - "narHash": "sha256-g565cBceeJTBGYSRO4Gr5mGz46RapgLolYUMXpFDBFU=", + "lastModified": 1679645578, + "narHash": "sha256-gN0mpWiZHhQlEA4/bfMQFuyNSebrm+WoOntDJtm3Npk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3e253022630b30c44c0246d2a83bf2c1f1b185c7", + "rev": "5974031f4d4cd09ea98f3febce783ba2d32f9c65", "type": "github" }, "original": { @@ -287,11 +402,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1678475794, - "narHash": "sha256-wBS87BjBhQb7aw4+GbCl2+hKN1JCrNeXT4BISD99eeo=", + "lastModified": 1679662069, + "narHash": "sha256-FpPx3B8vMeHB8iixbZUXq+6awFje8fUE8zyhDTgJ+AM=", "owner": "tweag", "repo": "nickel", - "rev": "085545cd673dfb6f87238f71be34f0d3d092469c", + "rev": "e70f4ba786bad673081629dd2f2ecfb87d0b3267", "type": "github" }, "original": { @@ -300,6 +415,32 @@ "type": "github" } }, + "nix-boost": { + "inputs": { + "cargo-leptos": "cargo-leptos", + "flake-compat": "flake-compat_5", + "gnmic": "gnmic", + "gomod2nix": "gomod2nix", + "naersk": "naersk", + "nixlib": "nixlib", + "nixpkgs": "nixpkgs_5", + "poetry2nix": "poetry2nix", + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1679675754, + "narHash": "sha256-B/jA2C77hCtnBmMbYhel5Bbon4nj1wB1dMacCHm3Hak=", + "ref": "refs/heads/master", + "rev": "c9744d6afa55f9c8eddd7847d27a8bb4b702e2e2", + "revCount": 50, + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost.git" + }, + "original": { + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost.git" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -307,11 +448,11 @@ ] }, "locked": { - "lastModified": 1678591454, - "narHash": "sha256-uEjRsVJIkfyRjTIYHscit8CAUw4kygdzJGplNiV25l8=", + "lastModified": 1679224439, + "narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=", "owner": "mic92", "repo": "nix-index-database", - "rev": "caf85d1716e1ce6d7a0da2b7f1ab1c46d9497662", + "rev": "2f5e6e915d70c04d673a8930f94591595c73eb84", "type": "github" }, "original": { @@ -322,8 +463,8 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1, @@ -336,6 +477,21 @@ "type": "path" } }, + "nixlib": { + "locked": { + "lastModified": 1679187309, + "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "44214417fe4595438b31bdb9469be92536a61455", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1671983799, @@ -354,11 +510,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1678872516, + "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", "type": "github" }, "original": { @@ -370,11 +526,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1678898370, + "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "ac718d02867a84b42522a0ece52d841188208f2c", "type": "github" }, "original": { @@ -384,6 +540,68 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1658285632, + "narHash": "sha256-zRS5S/hoeDGUbO+L95wXG9vJNwsSYcl93XiD0HQBXLk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5342fc6fb59d0595d26883c3cadff16ce58e44f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1679553901, + "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1679437018, + "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "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_7": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -398,13 +616,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_8": { "locked": { - "lastModified": 1678470307, - "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", + "lastModified": 1679437018, + "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f", + "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", "type": "github" }, "original": { @@ -414,7 +632,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_9": { "locked": { "lastModified": 1665296151, "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", @@ -430,6 +648,28 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nix-boost", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679613134, + "narHash": "sha256-C74l+I97ossJGP8/VJYs/YqxIZ6XHqohuuTnjKTNp/8=", + "owner": "pegasust", + "repo": "poetry2nix", + "rev": "654b3a8ed543361d5bef4210a0bf467678304c0d", + "type": "github" + }, + "original": { + "owner": "pegasust", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -445,11 +685,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1677832802, - "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", + "lastModified": 1678976941, + "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "382bee738397ca005206eefa36922cc10df8a21c", + "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e", "type": "github" }, "original": { @@ -466,10 +706,11 @@ "kpcli-py": "kpcli-py", "neovim-nightly-overlay": "neovim-nightly-overlay", "nickel": "nickel", + "nix-boost": "nix-boost", "nix-index-database": "nix-index-database", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay_3" + "nixpkgs": "nixpkgs_8", + "rust-overlay": "rust-overlay_4" } }, "rust-overlay": { @@ -511,11 +752,11 @@ ] }, "locked": { - "lastModified": 1677896940, - "narHash": "sha256-F4YW6/+35dwctY4Ogb/vvMfvA6O0UwhDbXE7urDhk4A=", + "lastModified": 1679106165, + "narHash": "sha256-03Opt2yu4E/AIFjvlgib0/nhMn6B4B/t/nvwS2bzOGw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c25d3e1951863ac0061d47a3fabf9aa7c91db5e5", + "rev": "7313c06ac334d6262ddfe30a38b3abc3da6bd565", "type": "github" }, "original": { @@ -527,14 +768,33 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1678588194, - "narHash": "sha256-IYEfP8On6ZFV69mXg2LOYFp8xleyZVJHolunVq+HEbI=", + "lastModified": 1679624450, + "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2ffce3e9c3da6c756a7862c7de2f6f9813c02aba", + "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1679624450, + "narHash": "sha256-wiDqUaklmc31E1+wz5sv52sMcWvZKsL1FBeGJCxz628=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "afbdcf305fd6f05f708fe76d52f24d37d066c251", "type": "github" }, "original": { @@ -557,6 +817,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 9f6d73b..7126dca 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -10,13 +10,13 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; - max-jobs = 4; + max-jobs = 12; }; description = "simple home-manager config"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:Pegasust/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; flake-utils.url = "github:numtide/flake-utils"; @@ -27,6 +27,7 @@ url = "path:../../out-of-tree/flake-compat"; flake = false; }; + nix-boost.url = "git+https://git.pegasust.com/pegasust/nix-boost.git"; kpcli-py = { url = "github:rebkwok/kpcli"; flake = false; @@ -52,6 +53,7 @@ , kpcli-py , neovim-nightly-overlay , nickel + , nix-boost , ... }: let diff --git a/overlays.nix b/overlays.nix index 1c308ca..5a0debb 100644 --- a/overlays.nix +++ b/overlays.nix @@ -4,6 +4,7 @@ flake_input@{ kpcli-py , neovim-nightly-overlay , system , nickel +, nix-boost , ... }: let kpcli-py = (final: prev: { @@ -15,9 +16,29 @@ flake_input@{ kpcli-py # tableformatter requires setuptools tableformatter = super.tableformatter.overridePythonAttrs ( old: { - buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools super.cython_3 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.cython_3 ]; + src = old.src; } ); + kpcli = super.kpcli.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [self.setuptools]; + src = old.src; + }); + + # ubersmith = super.ubersmith.overridePythonAttrs (old: { + # buildInputs = builtins.filter (x: ! builtins.elem x [ ]) ((old.buildInputs or [ ]) ++ [ + # py-final.setuptools + # py-final.pip + # ]); + # + # src = final.fetchFromGitHub { + # owner = "jasonkeene"; + # repo = "python-ubersmith"; + # rev = "0c594e2eb41066d1fe7860e3a6f04b14c14f6e6a"; + # sha256 = "sha256-Dystt7CBtjpLkgzCsAif8WkkYYeLyh7VMehAtwoDGuM="; + # }; + # }); + }); }; }); @@ -43,6 +64,7 @@ flake_input@{ kpcli-py lsp-nls nickel nickelWasm; }); in [ + nix-boost.overlays.default nixgl.overlays.default rust-overlay.overlays.default neovim-nightly-overlay.overlay diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index c2df20d..fbf2782 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # NOTE: Untested on case of no home-manager -set -xv +set -xveu # Where this script located SCRIPT_DIR=$(readlink -f $(dirname $0)) echo "SCRIPT_DIR: ${SCRIPT_DIR}" @@ -25,11 +25,12 @@ sudo launchctl start org.nixos.nix-daemon # Mason is bad: it puts binaries onto xdg.data # let's make mason starts fresh, just in case we introduce RPATH hacks # that injects binary for Mason to use. -rm -rf ~/.local/share/nvim/mason +sudo rm -rf ~/.local/share/nvim/mason # NOTE: https://discourse.nixos.org/t/relative-path-support-for-nix-flakes/18795 # nix flake update is required for relative paths to work nix flake update +nix flake update "${SCRIPT_DIR}/../nix-conf/home-manager" # test if we have home-manager, if not, attempt to use nix to put home-manager to # our environment if ! command -v home-manager ; then diff --git a/scripts/upload-to-cache.sh b/scripts/upload-to-cache.sh index 58597f4..1567ea1 100755 --- a/scripts/upload-to-cache.sh +++ b/scripts/upload-to-cache.sh @@ -1,11 +1,11 @@ #!/usr/bin/env sh -set -eux -set -f # disable globbing (/nix/store may contain glob chars) -export IFS=' ' -PATH=/nix/var/nix/profiles/default/bin:$PATH - -# $OUT_PATHS when invoked by nix.settings.post-build-hook will be -# space-separated paths to /nix/store/ -echo "Uploading paths" $OUT_PATHS -nix copy --to "ssh-ng://10.100.200.230" $OUT_PATHS +# set -eux +# set -f # disable globbing (/nix/store may contain glob chars) +# export IFS=' ' +# PATH=/nix/var/nix/profiles/default/bin:$PATH +# +# # $OUT_PATHS when invoked by nix.settings.post-build-hook will be +# # space-separated paths to /nix/store/ +# echo "Uploading paths" $OUT_PATHS +# nix copy --to "ssh-ng://10.100.200.230" $OUT_PATHS