From 820736fc8ccc41668d37413acd031e5202032020 Mon Sep 17 00:00:00 2001 From: Hung Date: Sat, 17 Jun 2023 23:31:47 -0700 Subject: [PATCH] wip: more migrations, mostly adding nix-index, kpcli-py, and nix-boost integration --- flake.lock | 1441 ++++++++++++++++++++-- flake.nix | 37 +- native_configs/neovim/init.lua | 2 +- nix-conf/home-manager/home.nix | 3 - nix/cells/dotfiles/packages/default.nix | 22 + nix/cells/home-configs/default.nix | 5 - nix/cells/packages/default.nix | 4 - nix/cells/repo/home-configs/default.nix | 44 + nix/cells/repo/home-profiles/default.nix | 47 + nix/cells/repo/home-profiles/neovim.nix | 15 +- nix/cells/repo/lib/default.nix | 29 +- nix/cells/repo/packages/default.nix | 6 + 12 files changed, 1502 insertions(+), 153 deletions(-) create mode 100644 nix/cells/dotfiles/packages/default.nix delete mode 100644 nix/cells/home-configs/default.nix delete mode 100644 nix/cells/packages/default.nix create mode 100644 nix/cells/repo/home-configs/default.nix create mode 100644 nix/cells/repo/packages/default.nix diff --git a/flake.lock b/flake.lock index 52a579a..676ed68 100644 --- a/flake.lock +++ b/flake.lock @@ -15,7 +15,7 @@ "type": "github" } }, - "colmena": { + "blank_2": { "locked": { "lastModified": 1625557891, "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", @@ -30,16 +30,79 @@ "type": "github" } }, + "cargo-leptos": { + "flake": false, + "locked": { + "lastModified": 1686759547, + "narHash": "sha256-hZevu2lwyYFenABu1uV7/mZc7SXfLzR6Pdmc3zHJ2vw=", + "owner": "leptos-rs", + "repo": "cargo-leptos", + "rev": "75d3905cad6feb68be14659a802f75f48034a4ac", + "type": "github" + }, + "original": { + "owner": "leptos-rs", + "repo": "cargo-leptos", + "type": "github" + } + }, "crane": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1686621798, + "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", + "owner": "ipetkov", + "repo": "crane", + "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "nix-boost", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1676162383, + "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_10", "nixpkgs": [ "std", "paisano-mdbook-preprocessor", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1676162383, @@ -78,10 +141,11 @@ "devshell": { "inputs": { "nixpkgs": [ + "nix-boost", "std", "nixpkgs" ], - "systems": "systems" + "systems": "systems_4" }, "locked": { "lastModified": 1686680692, @@ -97,22 +161,63 @@ "type": "github" } }, - "disko": { + "devshell_2": { + "inputs": { + "nixpkgs": [ + "std", + "nixpkgs" + ], + "systems": "systems_6" + }, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1686680692, + "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", + "owner": "numtide", + "repo": "devshell", + "rev": "fd6223370774dd9c33354e87a007004b5fd36442", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, "dmerge": { + "inputs": { + "haumea": [ + "nix-boost", + "std", + "haumea" + ], + "nixlib": [ + "nix-boost", + "std", + "haumea", + "nixpkgs" + ], + "yants": [ + "nix-boost", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "owner": "divnix", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "type": "github" + }, + "original": { + "owner": "divnix", + "ref": "0.2.1", + "repo": "dmerge", + "type": "github" + } + }, + "dmerge_2": { "inputs": { "haumea": [ "std", @@ -145,7 +250,7 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -162,6 +267,25 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": "nixpkgs_13", + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1677306201, + "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "0923f0c162f65ae40261ec940406049726cfeab4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -194,13 +318,169 @@ "type": "github" } }, + "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": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "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-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-compat_7": { + "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-parts": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_10": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -224,31 +504,201 @@ "type": "github" } }, - "haumea": { + "flake-utils_3": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_3" + }, + "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_6": { + "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_7": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "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" + } + }, + "gitignore": { "inputs": { "nixpkgs": [ - "hive", + "neovim-nightly-overlay", + "hercules-ci-effects", + "hercules-ci-agent", + "pre-commit-hooks-nix", "nixpkgs" ] }, "locked": { - "lastModified": 1681873442, - "narHash": "sha256-wsOEGbDKf+M/THE7JZi43s4szXTuIaiQNBxlb5Lnxs0=", + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnmic": { + "flake": false, + "locked": { + "lastModified": 1686895285, + "narHash": "sha256-97QB49OAqt0zamA+SRZKkgj0GE/u0MTzHHjEEFuGb5s=", + "owner": "openconfig", + "repo": "gnmic", + "rev": "6413a00addb79e9762d5ad3e77866b1da0a532fb", + "type": "github" + }, + "original": { + "owner": "openconfig", + "repo": "gnmic", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", "owner": "nix-community", - "repo": "haumea", - "rev": "85038436851caf5bbf652a2fedf38b2b28e38caf", + "repo": "gomod2nix", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.2.1", - "repo": "haumea", + "repo": "gomod2nix", "type": "github" } }, - "haumea_2": { + "haskell-flake": { + "locked": { + "lastModified": 1678138103, + "narHash": "sha256-D0lao82bV3t2gEFjHiU6RN233t+1MnkQV+bq8MEu2ic=", + "owner": "hercules-ci", + "repo": "haskell-flake", + "rev": "1e1660e6dd00838ba73bc7952e6e73be67da18d1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "ref": "0.1-extraLibraries", + "repo": "haskell-flake", + "type": "github" + } + }, + "haumea": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1685133229, @@ -265,46 +715,113 @@ "type": "github" } }, - "hive": { + "haumea_2": { "inputs": { - "colmena": "colmena", - "disko": "disko", - "haumea": "haumea", - "home-manager": "home-manager", - "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", - "paisano": "paisano" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1686781920, - "narHash": "sha256-1KHvvV2qcypAC6Zn+7HL+VxOuVttB3Iqrp/kDwLbqiI=", - "owner": "divnix", - "repo": "hive", - "rev": "a057e2df518c7ecb0dd14bd42661dc11129609c4", + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", "type": "github" }, "original": { - "owner": "divnix", - "repo": "hive", + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, + "hercules-ci-agent": { + "inputs": { + "flake-parts": "flake-parts_3", + "haskell-flake": "haskell-flake", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks-nix": "pre-commit-hooks-nix" + }, + "locked": { + "lastModified": 1678446614, + "narHash": "sha256-Z6Gsba5ahn/N0QlF0vJfIEfnZgCs4qr1IZtXAqjbE7s=", + "owner": "hercules-ci", + "repo": "hercules-ci-agent", + "rev": "0b90d1a87c117a5861785cb85833dd1c9df0b6ef", + "type": "github" + }, + "original": { + "id": "hercules-ci-agent", + "type": "indirect" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "hercules-ci-agent": "hercules-ci-agent", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1681898675, + "narHash": "sha256-nIJ7CAdiHv4i1no/VgDoeTJLzbLYwu5+/Ycoyzn0S78=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "15ff4f63e5f28070391a5b09a82f6d5c6cc5c9d0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", "type": "github" } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "lastModified": 1687041769, + "narHash": "sha256-lPDVNMrDF/hOVy+P8pEtKzvSN/Akk9RbDcyNuvW1T+M=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "edf9cf65238609db16680be74fe28d4d4858476e", "type": "github" }, "original": { - "owner": "divnix", - "repo": "blank", + "owner": "nix-community", + "repo": "home-manager", "type": "github" } }, "incl": { + "inputs": { + "nixlib": [ + "nix-boost", + "std", + "haumea", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "incl_2": { "inputs": { "nixlib": [ "std", @@ -326,7 +843,50 @@ "type": "github" } }, + "kpcli-py": { + "flake": false, + "locked": { + "lastModified": 1679142558, + "narHash": "sha256-l18PBzf/P7d3BPcFb5gSDX863MsC7S747qooyg0u2lA=", + "owner": "rebkwok", + "repo": "kpcli", + "rev": "1c64e7274345d28ebc2607e22211a4ee9f6dbe7f", + "type": "github" + }, + "original": { + "owner": "rebkwok", + "repo": "kpcli", + "type": "github" + } + }, "n2c": { + "inputs": { + "flake-utils": [ + "nix-boost", + "std", + "flake-utils" + ], + "nixpkgs": [ + "nix-boost", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685771919, + "narHash": "sha256-3lVKWrhNXjHJB6QkZ2SJaOs4X/mmYXtY6ovPVpDMOHc=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "95e2220911874064b5d809f8d35f7835184c4ddf", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_2": { "inputs": { "flake-utils": [ "std", @@ -351,7 +911,158 @@ "type": "github" } }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1682581904, + "narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=", + "owner": "neovim", + "repo": "neovim", + "rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "neovim-nightly-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "hercules-ci-effects": "hercules-ci-effects", + "neovim-flake": "neovim-flake", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684067841, + "narHash": "sha256-UzOHzcx5KrysKdLZuyU2k5RipVa6wP8EbVeqF/C7OLM=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "88a6c749a7d126c49f3374f9f28ca452ea9419b8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "88a6c749a7d126c49f3374f9f28ca452ea9419b8", + "type": "github" + } + }, + "nix-boost": { + "inputs": { + "cargo-leptos": "cargo-leptos", + "crane": "crane", + "flake-compat": "flake-compat_5", + "gnmic": "gnmic", + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs_5", + "poetry2nix": "poetry2nix", + "rust-overlay": "rust-overlay_2", + "std": "std" + }, + "locked": { + "lastModified": 1687069436, + "narHash": "sha256-GdtAbw1o5lF6kad/INP/UMhq+LtK80BI+StwdNKJQlo=", + "ref": "bleed", + "rev": "5812ec3cbb89f0e954db3ee66644e7c7f6e70444", + "revCount": 88, + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost" + }, + "original": { + "ref": "bleed", + "type": "git", + "url": "https://git.pegasust.com/pegasust/nix-boost" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs-latest" + ] + }, + "locked": { + "lastModified": 1686740472, + "narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=", + "owner": "mic92", + "repo": "nix-index-database", + "rev": "e11c61073b777e025993c5ef63ddbf776a9cca15", + "type": "github" + }, + "original": { + "owner": "mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nixago": { + "inputs": { + "flake-utils": [ + "nix-boost", + "std", + "flake-utils" + ], + "nixago-exts": [ + "nix-boost", + "std", + "blank" + ], + "nixpkgs": [ + "nix-boost", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683210100, + "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", + "owner": "nix-community", + "repo": "nixago", + "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_2": { "inputs": { "flake-utils": [ "std", @@ -380,21 +1091,6 @@ "type": "github" } }, - "nixos-generators": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1671417167, @@ -411,23 +1107,56 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-latest": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1687069429, + "narHash": "sha256-AEBWBsIxyE5YJrY4ih/KDgCMSufVD3Dec9ruVuXbuFo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "192011a33fdfda7b9a1bc42fba5c964fd5452d54", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { "locked": { "lastModified": 1686960236, "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", @@ -443,7 +1172,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_11": { "locked": { "lastModified": 1681001314, "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", @@ -458,7 +1187,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_12": { "locked": { "lastModified": 1675940568, "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", @@ -474,7 +1203,134 @@ "type": "github" } }, + "nixpkgs_13": { + "locked": { + "lastModified": 1677063315, + "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1678293141, + "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1685714850, + "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c6ffce3d5df7b4c588ce80a0c6e2d2348a611707", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "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_5": { + "locked": { + "lastModified": 1686960236, + "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1677063315, "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", @@ -523,27 +1379,56 @@ "paisano": { "inputs": { "nixpkgs": [ - "hive", + "nix-boost", + "std", "nixpkgs" ], "nosys": "nosys", - "yants": "yants" + "yants": [ + "nix-boost", + "std", + "yants" + ] }, "locked": { - "lastModified": 1678562978, - "narHash": "sha256-GaPyKdB0RvSBIgPxKkdJHTG/FyKsT0Ku5zifLEjr3QQ=", - "owner": "divnix", - "repo": "paisano", - "rev": "f71a2db9414d66663c03a65ade97a9f353fb6d55", + "lastModified": 1686862844, + "narHash": "sha256-m8l/HpRBJnZ3c0F1u0IyQ3nYGWE0R9V5kfORuqZPzgk=", + "owner": "paisano-nix", + "repo": "core", + "rev": "6674b3d3577212c1eeecd30d62d52edbd000e726", "type": "github" }, "original": { - "owner": "divnix", - "repo": "paisano", + "owner": "paisano-nix", + "ref": "0.1.1", + "repo": "core", "type": "github" } }, "paisano-actions": { + "inputs": { + "nixpkgs": [ + "nix-boost", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677306424, + "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", + "owner": "paisano-nix", + "repo": "actions", + "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "actions", + "type": "github" + } + }, + "paisano-actions_2": { "inputs": { "nixpkgs": [ "std", @@ -567,13 +1452,42 @@ }, "paisano-mdbook-preprocessor": { "inputs": { - "crane": "crane", + "crane": "crane_2", "fenix": "fenix", "nixpkgs": [ + "nix-boost", "std", "nixpkgs" ], "paisano-actions": "paisano-actions", + "std": [ + "nix-boost", + "std" + ] + }, + "locked": { + "lastModified": 1680654400, + "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "type": "github" + } + }, + "paisano-mdbook-preprocessor_2": { + "inputs": { + "crane": "crane_3", + "fenix": "fenix_2", + "nixpkgs": [ + "std", + "nixpkgs" + ], + "paisano-actions": "paisano-actions_2", "std": [ "std" ] @@ -593,6 +1507,33 @@ } }, "paisano-tui": { + "inputs": { + "nixpkgs": [ + "nix-boost", + "std", + "blank" + ], + "std": [ + "nix-boost", + "std" + ] + }, + "locked": { + "lastModified": 1681847764, + "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "ref": "0.1.1", + "repo": "tui", + "type": "github" + } + }, + "paisano-tui_2": { "inputs": { "nixpkgs": [ "std", @@ -644,12 +1585,88 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nix-boost", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1686970505, + "narHash": "sha256-s3gtsusfeIoMYy0BTXXfoDq1IeDj8rPl4JMcR97H9XU=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "95d3cbc56d21917abace0cc1de10997469eb80b4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "poetry2nix_2": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1686970505, + "narHash": "sha256-s3gtsusfeIoMYy0BTXXfoDq1IeDj8rPl4JMcR97H9XU=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "95d3cbc56d21917abace0cc1de10997469eb80b4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1678376203, + "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "deploy-rs": "deploy-rs", - "hive": "hive", - "nixpkgs": "nixpkgs_3", - "std": "std" + "home-manager": "home-manager", + "kpcli-py": "kpcli-py", + "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-boost": "nix-boost", + "nix-index-database": "nix-index-database", + "nixpkgs": "nixpkgs_10", + "nixpkgs-latest": "nixpkgs-latest", + "poetry2nix": "poetry2nix_2", + "std": "std_2" } }, "rust-analyzer-src": { @@ -669,7 +1686,101 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1677221702, + "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "nix-boost", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nix-boost", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1687055571, + "narHash": "sha256-UvLoO6u5n9TzY80BpM4DaacxvyJl7u9mm9CA72d309g=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2de557c780dcb127128ae987fca9d6c2b0d7dc0f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "nix-boost", + "std", + "paisano-mdbook-preprocessor", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "nix-boost", + "std", + "paisano-mdbook-preprocessor", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "flake-utils": [ "std", @@ -701,15 +1812,60 @@ "std": { "inputs": { "arion": [ + "nix-boost", "std", "blank" ], "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils", - "haumea": "haumea_2", + "flake-utils": "flake-utils_6", + "haumea": "haumea", "incl": "incl", + "makes": [ + "nix-boost", + "std", + "blank" + ], + "microvm": [ + "nix-boost", + "std", + "blank" + ], + "n2c": "n2c", + "nixago": "nixago", + "nixpkgs": "nixpkgs_8", + "paisano": "paisano", + "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", + "paisano-tui": "paisano-tui", + "yants": "yants" + }, + "locked": { + "lastModified": 1686890041, + "narHash": "sha256-yLucgr7q8o63yJHLd5b5rF/h27ktYTQrn9rYxVxrs3E=", + "owner": "divnix", + "repo": "std", + "rev": "8671b6892e45d795d7409940750832d68c929dcf", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_2": { + "inputs": { + "arion": [ + "std", + "blank" + ], + "blank": "blank_2", + "devshell": "devshell_2", + "dmerge": "dmerge_2", + "flake-utils": "flake-utils_9", + "haumea": "haumea_2", + "incl": "incl_2", "makes": [ "std", "blank" @@ -718,12 +1874,12 @@ "std", "blank" ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": "nixpkgs_5", + "n2c": "n2c_2", + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_12", "paisano": "paisano_2", - "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", - "paisano-tui": "paisano-tui", + "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor_2", + "paisano-tui": "paisano-tui_2", "yants": "yants_2" }, "locked": { @@ -755,6 +1911,81 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -770,20 +2001,36 @@ "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" + } + }, "yants": { "inputs": { "nixpkgs": [ - "hive", - "paisano", + "nix-boost", + "std", + "haumea", "nixpkgs" ] }, "locked": { - "lastModified": 1677285314, - "narHash": "sha256-hlAcg2514zKrPu8jn24BUsIjjvXvCLdw1jvKgBTpqko=", + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", "owner": "divnix", "repo": "yants", - "rev": "9eab24b273ce021406c852166c216b86e2bb4ec4", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f447ce7..0e06186 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,37 @@ description = "My personal configuration in Nix (and some native configurations)"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-latest.url = "github:nixos/nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; std.url = "github:divnix/std"; - rust-overlay = "github:oxalica/rust-overlay.git"; + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + neovim-nightly-overlay = { + # need to pin this until darwin build is successful again. + url = "github:nix-community/neovim-nightly-overlay?rev=88a6c749a7d126c49f3374f9f28ca452ea9419b8"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-boost = { + url = "git+https://git.pegasust.com/pegasust/nix-boost?ref=bleed"; + }; + kpcli-py = { + url = "github:rebkwok/kpcli"; + flake = false; + }; + nix-index-database = { + url = "github:mic92/nix-index-database"; + # Should show the latest nixpkgs whenever possible + inputs.nixpkgs.follows = "nixpkgs-latest"; + }; }; - outputs = {std, ...} @ inputs: + outputs = {self, std, ...} @ inputs: std.growOn { # boilerplate @@ -32,13 +57,13 @@ ]; } { - devShells = std.harvest [["dotfiles" "devshells"]]; + devShells = std.harvest self [["dotfiles" "devshells"]]; # nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; # homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; - homeModules = std.pick [["repo" "home-modules"]]; + homeModules = std.pick self [["repo" "home-modules"]]; # TODO: Debug only - homeProfiles = std.pick [["repo" "home-profiles"]]; - packages = std.harvest [["repo" "home-configs"]]; + homeProfiles = std.pick self [["repo" "home-profiles"]]; + packages = std.harvest self [["repo" "home-configs"] ["repo" "packages"]]; }; } diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index b12556d..ff1c73c 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -900,7 +900,7 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities() -- default language servers local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'lua_ls', 'cmake', 'tailwindcss', 'prismals', - 'rnix', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls', "ansiblels", + 'nil_ls', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls', "ansiblels", "jsonls", "denols", "gopls", "nickel_ls", 'pylsp', } require("mason").setup({ diff --git a/nix-conf/home-manager/home.nix b/nix-conf/home-manager/home.nix index 4510639..9c5f86e 100644 --- a/nix-conf/home-manager/home.nix +++ b/nix-conf/home-manager/home.nix @@ -67,9 +67,6 @@ in { programs.jq = { enable = true; }; - # not exist in home-manager - # have to do it at system level - # services.ntp.enable = true; # automatic time programs.nix-index = { enable = true; enableBashIntegration = true; diff --git a/nix/cells/dotfiles/packages/default.nix b/nix/cells/dotfiles/packages/default.nix new file mode 100644 index 0000000..8b6a4e8 --- /dev/null +++ b/nix/cells/dotfiles/packages/default.nix @@ -0,0 +1,22 @@ +{ + inputs, + cell, +}: let + inherit (inputs.poetry2nix) mkPoetryApplication defaultPoetryOverrides; +in { + kpcli-py = mkPoetryApplication { + projectDir = inputs.kpcli-py; + overrides = defaultPoetryOverrides.extend (self: super: { + # TODO: add this to upstream poetry2nix + tableformatter = super.tableformatter.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or []) ++ [self.setuptools self.cython_3]; + src = old.src; + }); + + kpcli = super.kpcli.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or []) ++ [self.setuptools]; + }); + }); + }; + +} diff --git a/nix/cells/home-configs/default.nix b/nix/cells/home-configs/default.nix deleted file mode 100644 index 027783e..0000000 --- a/nix/cells/home-configs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - inputs, - cell, -}: let -in {} diff --git a/nix/cells/packages/default.nix b/nix/cells/packages/default.nix deleted file mode 100644 index d2b2fc2..0000000 --- a/nix/cells/packages/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - inputs, - cell, -}: {} diff --git a/nix/cells/repo/home-configs/default.nix b/nix/cells/repo/home-configs/default.nix new file mode 100644 index 0000000..0aeec55 --- /dev/null +++ b/nix/cells/repo/home-configs/default.nix @@ -0,0 +1,44 @@ +# TODO: this should use winnow with a fair matching of supported systems +{ + inputs, + cell, +}: let + inherit (cell) home-profiles home-modules; + inherit (inputs) home-manager; + pkgs = inputs.nixpkgs; + + # hm is derivation that is compatible with homeConfigurations + home-config = {supported_systems, hm, tested_systems ? []}: + hm // { + _supported_systems = supported_systems; + _tested_systems = tested_systems; + }; + + base-modules = [ + home-profiles.alacritty + home-profiles.git + home-profiles.ssh + home-profiles.shells + ({config.programs.home-manager.enable = true;}) + home-profiles.nix-index + ]; +in { + htran = home-config { + supported_systems = ["aarch64-darwin" "x86_64-darwin"]; + tested_systems = ["aarch64-darwin"]; + hm = home-manager.lib.homeConfigurations { + inherit pkgs; + modules = base-modules ++ [ + home-profiles.nerd_font_module + home-profiles.git-htran + home-profiles.dev-packages + home-profiles.zk + home-modules.darwin-spotlight + ]; + # TODO: might need config prefix. remove this todo after QA + home.username = "htran"; + home.homeDirectory = "/Users/htran"; + home.stateVersion = "23.11"; + }; + }; +} diff --git a/nix/cells/repo/home-profiles/default.nix b/nix/cells/repo/home-profiles/default.nix index 79bd3f5..7bb29de 100644 --- a/nix/cells/repo/home-profiles/default.nix +++ b/nix/cells/repo/home-profiles/default.nix @@ -141,4 +141,51 @@ in { }; }; }; + + git-htran = { + imports = [inputs.cells.repo.home-profiles.git]; + config.git."${namespace}".name = "htran"; + config.git."${namespace}".email = "htran@egihosting.com"; + }; + + git-pegasust = { + imports = [inputs.cells.repo.home-profiles.git]; + config.git."${namespace}".name = "pegasust"; + config.git."${namespace}".email = "pegasucksgg@gmail.com"; + }; + + dev-packages = let pkgs = inputs.nixpkgs; in { + programs.jq.enable = true; + home.packages = [ + pkgs.htop + pkgs.ripgrep + pkgs.unzip + pkgs.zip + + pkgs.yq-go + pkgs.mosh + pkgs.python310 + ]; + }; + + # Local nixpkgs search and fallback if command not found to search from nixpkgs + nix-index = { + imports = [ + inputs.nix-index-database.hmModules.nix-index + ]; + programs.nix-index = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + }; + }; + + # digital garden stack + zk = { + xdg.configFile."zk/config.toml".source = "${inputs.self}/native_configs/zk/config.toml"; + # NB: lib.mkMerge + home.packages = [ + inputs.nixpkgs.zk + ]; + }; } diff --git a/nix/cells/repo/home-profiles/neovim.nix b/nix/cells/repo/home-profiles/neovim.nix index 56fa549..dae5545 100644 --- a/nix/cells/repo/home-profiles/neovim.nix +++ b/nix/cells/repo/home-profiles/neovim.nix @@ -18,14 +18,7 @@ # see: :/--suffix.*PATH # there should be mentions of additional packages my_neovim = pkgs.neovim-unwrapped; - rust_pkgs = - pkgs.rust-bin.selectLatestNightlyWith - ( - toolchain: - toolchain.default.override { - extensions = ["rust-src" "rust-analyzer" "rust-docs" "rustfmt" "clippy" "miri"]; - } - ); + inherit (inputs) system; nvim_pkgs = [ # pkgs.gccStdenv @@ -35,8 +28,8 @@ pkgs.zk # Zettelkasten (limited support) pkgs.fd # Required by a Telescope plugin (?) pkgs.stdenv.cc.cc.lib - pkgs.rnix-lsp # doesn't work, Mason just installs it using cargo - pkgs.rust4cargo + pkgs.nil # oxalica's better nix language server + inputs.nix-boost.packages."${system}".rust4cargo pkgs.nickel pkgs.nls @@ -90,7 +83,7 @@ in { extraLuaConfig = builtins.readFile "${inputs.self}/native_configs/neovim/init.lua"; plugins = let inherit - (pkgs.vimPlugins) + (inputs.nixpkgs-latest.vimPlugins) plenary-nvim nvim-treesitter nvim-treesitter-textobjects diff --git a/nix/cells/repo/lib/default.nix b/nix/cells/repo/lib/default.nix index a44fed5..65c97f6 100644 --- a/nix/cells/repo/lib/default.nix +++ b/nix/cells/repo/lib/default.nix @@ -1,7 +1,6 @@ { inputs, cell }: let - namespace = "repo"; - + namespace = "repo"; # ignore: unused yamlToJsonDrv = pkgs: yamlContent: outputPath: (pkgs.runCommand outputPath @@ -10,30 +9,8 @@ let # note that $out is passed onto the bash/sh script for execution '' echo "$yamlContent" | yq >$out - '') - { }); + ''); in { - fromYAML = yamlContent: bulitins.fromJSON (builtins.readFile (yamlToJsonDrv inputs.nixpkgs yamlContent "fromYaml.json")); - - # NOTE: Deprecate - # ctor - opt-some = a: [ a ]; - opt-none = [ ]; - opt-none_thunk = _: [ ]; - - # from-to null - opt-fromNullable = nullable: if nullable == null then [ ] else [ nullable ]; - opt-toNullable = opt-fork (a:a) (_: null); - - opt-map = builtins.map; - opt-filter = builtins.filter; - opt-fork = on_some: on_none: opt: if opt == [ ] then (on_none null) else (on_some (builtins.elemAt opt 0)); - - opt-unwrap = opt-fork (a:a) (_: throw "opt-unwrap: expected some, got none"); - opt-unwrapOrElse = opt-fork (a:a); - opt-unwrapOr = fallback_val: opt-fork (a:a) (_: fallback_val); - - opt-orElse = opt: fallback_opt: opt-fork (opt-some) (opt-none_thunk) (opt ++ fallback_opt); - opt-leftmostSome = opts: builtins.foldl' (opt-orElse) [ ] opts; + fromYAML = yamlContent: builtins.fromJSON (builtins.readFile (yamlToJsonDrv inputs.nixpkgs yamlContent "fromYaml.json")); } diff --git a/nix/cells/repo/packages/default.nix b/nix/cells/repo/packages/default.nix new file mode 100644 index 0000000..a66539c --- /dev/null +++ b/nix/cells/repo/packages/default.nix @@ -0,0 +1,6 @@ +{ + inputs, + cell, +}: { + inherit (inputs.cells.dotfiles.packages) kpcli-py; +}