From ca342f9aff33d6f551123b89f1d747a9843e7da5 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Wed, 21 Aug 2024 23:26:51 +0200 Subject: [PATCH] feat(profiles/base): add coma/command-not-found --- lib/mkmachine.nix | 26 ++++++++++++++++++++++++++ profiles/base.nix | 7 +++++++ 2 files changed, 33 insertions(+) diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix index 3860ae9..751ba3f 100644 --- a/lib/mkmachine.nix +++ b/lib/mkmachine.nix @@ -56,6 +56,32 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" { hydrasect = prev.pkgs.callPackage ../packages/hydrasect { }; codeberg-pages-custom = prev.pkgs.callPackage ../packages/codeberg-pages-custom { }; }) + + ( + _final: prev: + let + generated = import "${inputs.nix-index-database}/generated.nix"; + nix-index-database = + (prev.fetchurl { + url = generated.url + prev.stdenv.system; + hash = generated.hashes.${prev.stdenv.system}; + }).overrideAttrs + { + __structuredAttrs = true; + unsafeDiscardReferences.out = true; + }; + in + { + inherit nix-index-database; + nix-index-with-db = prev.callPackage "${inputs.nix-index-database}/nix-index-wrapper.nix" { + inherit nix-index-database; + }; + comma-with-db = prev.callPackage "${inputs.nix-index-database}/comma-wrapper.nix" { + inherit nix-index-database; + }; + } + ) + ]; } ]; diff --git a/profiles/base.nix b/profiles/base.nix index f275fbc..3c72e35 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -52,6 +52,7 @@ kitty tailscale step-cli + comma-with-db ]; environment.variables.EDITOR = "nvim"; @@ -63,6 +64,12 @@ services.tailscale.enable = true; + programs.command-not-found.enable = false; + programs.nix-index = { + enable = true; + package = pkgs.nix-index-with-db; + }; + age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" "/persistent/etc/ssh/ssh_host_ed25519_key"