maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Fix registry

Browse source
This commit is contained in:
maralorn 2023-02-19 12:25:22 +01:00
parent c2f7e8e1de
commit ee00a86744
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.lock
View file

@ -269,30 +269,32 @@
"locked": { "locked": {
"lastModified": 1676718858, "lastModified": 1676718858,
"narHash": "sha256-giQecvcifVLNHCC9lMfTGP09tNxXhOMw+d/aql7MhRw=", "narHash": "sha256-giQecvcifVLNHCC9lMfTGP09tNxXhOMw+d/aql7MhRw=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e6d5772f3515b8518d50122471381feae7cbae36", "rev": "e6d5772f3515b8518d50122471381feae7cbae36",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-22.11", "ref": "nixos-22.11",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1676721149, "lastModified": 1676721149,
"narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=", "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2", "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-140774-workaround": { "nixpkgs-140774-workaround": {

5
flake.nix
View file

@ -24,7 +24,8 @@
}; };
url = "git+ssh://git@hera.m-0.eu/nix-output-monitor?ref=main"; url = "git+ssh://git@hera.m-0.eu/nix-output-monitor?ref=main";
}; };
nixos-unstable.url = "nixpkgs/nixos-unstable"; # Don’t use registry so that we can override it locally.
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-mailserver = { nixos-mailserver = {
inputs = { inputs = {
flake-compat.follows = ""; flake-compat.follows = "";
@ -35,7 +36,7 @@
}; };
url = "git+https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git"; url = "git+https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git";
}; };
nixos-stable.url = "nixpkgs/nixos-22.11"; nixos-stable.url = "github:nixos/nixpkgs/nixos-22.11";
flake-parts.inputs.nixpkgs-lib.follows = "nixos-unstable"; flake-parts.inputs.nixpkgs-lib.follows = "nixos-unstable";
home-manager = { home-manager = {
url = "home-manager/release-22.11"; url = "home-manager/release-22.11";

16
nixos/roles/default.nix
View file

@ -115,15 +115,13 @@
}; };
nix = { nix = {
registry = [ registry.nixpkgs = {
{ from = {
from = { type = "indirect";
type = "indirect"; id = "nixpkgs";
id = "nixpkgs"; };
}; flake = pkgs.flake-inputs.nixos-stable;
flake = pkgs.flake-inputs.nixos-stable; };
}
];
settings.trusted-users = ["maralorn" "laminar"]; settings.trusted-users = ["maralorn" "laminar"];
# Extra Option which is on by default: allow-import-from-derivation = true # Extra Option which is on by default: allow-import-from-derivation = true
extraOptions = '' extraOptions = ''