From 89d01143a8142bccf405580770d47237aec0f21e Mon Sep 17 00:00:00 2001 From: Baitinq Date: Wed, 21 Sep 2022 19:23:00 +0200 Subject: Misc: Move nix-index symlink to global configuration --- hosts/configuration.nix | 4 +++- hosts/default.nix | 2 +- hosts/luna/default.nix | 2 -- hosts/phobos/default.nix | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/configuration.nix b/hosts/configuration.nix index ce2a577..6ce152e 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -1,4 +1,4 @@ -{ secrets, dotfiles, lib, pkgs, config, hostname, inputs, user, timezone, ... }: { +{ secrets, dotfiles, lib, pkgs, config, hostname, inputs, user, timezone, system, ... }: { imports = [ "${inputs.impermanence}/nixos.nix" @@ -108,6 +108,8 @@ environment.defaultPackages = [ ]; + environment.etc."nix-index/files".source = inputs.nix-index.legacyPackages.${system}.database; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index d1639b8..925022f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -16,7 +16,7 @@ let ] ++ extraOverlays; }; - extraArgs = { inherit pkgs inputs isIso isHardware user secrets dotfiles timezone location; hostname = host; }; + extraArgs = { inherit pkgs inputs isIso isHardware user secrets dotfiles timezone location hardware system; hostname = host; }; extraSpecialModules = extraModules ++ lib.optional isHardware ../hardware/${hardware} ++ lib.optional isIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; in diff --git a/hosts/luna/default.nix b/hosts/luna/default.nix index 9fbe164..6135307 100644 --- a/hosts/luna/default.nix +++ b/hosts/luna/default.nix @@ -31,7 +31,5 @@ xf86_input_cmt #chromebook touchpad drivers ]; - environment.etc."nix-index/files".source = inputs.nix-index.legacyPackages.x86_64-linux.database; - } diff --git a/hosts/phobos/default.nix b/hosts/phobos/default.nix index 5d4e4cc..014c24c 100644 --- a/hosts/phobos/default.nix +++ b/hosts/phobos/default.nix @@ -33,7 +33,5 @@ ''; */ - environment.etc."nix-index/files".source = inputs.nix-index.legacyPackages.x86_64-linux.database; - } -- cgit 1.4.1