Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Nix: write system nixpkgs into registry

Browse source
This commit is contained in:
Toast 2023-08-26 21:19:28 +02:00
parent 200ff43096
commit 0dbd1faaa6
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -28,7 +28,8 @@ inputs = {
nix-impermanence.url = "github:nix-community/impermanence"; nix-impermanence.url = "github:nix-community/impermanence";
}; };
outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... }: { outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... } @inputs: {
devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
name = "Environment for toast's nixos configurations"; name = "Environment for toast's nixos configurations";
# The agenix cli is not needed to activate a configuration, so instead of installing it # The agenix cli is not needed to activate a configuration, so instead of installing it
@ -46,6 +47,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
nixosConfigurations = { nixosConfigurations = {
Archie = nixpkgs-unstable.lib.nixosSystem { Archie = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs-unstable; };
/* /*
I used to set up nixpkgs in the flake, but doing that made I used to set up nixpkgs in the flake, but doing that made
defining overlays in modules impossible (or at least I could defining overlays in modules impossible (or at least I could
@ -67,6 +69,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
SurfaceGo = nixpkgs.lib.nixosSystem { SurfaceGo = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; };
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
@ -82,6 +85,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
Everest = nixpkgs.lib.nixosSystem { Everest = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; };
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }

5
roles/common/programs/nix.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { config, systemPkgs, ... }:
{ {
nix = { nix = {
@ -10,6 +10,9 @@ experimental-features = nix-command flakes
from = { id = "agenix"; type = "indirect"; }; from = { id = "agenix"; type = "indirect"; };
to = { owner = "ryantm"; repo = "agenix"; type = "github"; }; to = { owner = "ryantm"; repo = "agenix"; type = "github"; };
}; };
# Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html
system.flake = systemPkgs;
}; };
}; };
} }