proper registry

This commit is contained in:
dusk 2021-05-28 19:37:09 +03:00
parent 08dfd1b7cb
commit be53b5b4b6
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 29 additions and 15 deletions

View File

@ -450,6 +450,9 @@
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixosPersistence": "nixosPersistence", "nixosPersistence": "nixosPersistence",
"nixpkgs": [
"nixos"
],
"nixpkgsWayland": "nixpkgsWayland", "nixpkgsWayland": "nixpkgsWayland",
"nur": "nur", "nur": "nur",
"pkgs": "pkgs" "pkgs": "pkgs"

View File

@ -4,6 +4,7 @@
inputs = inputs =
{ {
nixos.url = "nixpkgs/nixos-unstable"; nixos.url = "nixpkgs/nixos-unstable";
nixpkgs.follows = "nixos";
latest.url = "nixpkgs"; latest.url = "nixpkgs";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";

View File

@ -1,4 +1,4 @@
{ self, config, pkgs, lib, ourLib, ... }: { self, inputs, config, pkgs, lib, ourLib, ... }:
let let
inherit (lib) fileContents mkIf; inherit (lib) fileContents mkIf;
pkgBin = ourLib.pkgBinNoDep pkgs; pkgBin = ourLib.pkgBinNoDep pkgs;
@ -139,20 +139,28 @@ in
diff-closures /run/current-system "$systemConfig" diff-closures /run/current-system "$systemConfig"
''; '';
nix = { nix =
autoOptimiseStore = true; let
gc.automatic = true; registry =
optimise.automatic = true; builtins.mapAttrs
useSandbox = true; (_: v: { flake = v; })
allowedUsers = [ "@wheel" ]; (lib.filterAttrs (_: v: v ? outputs) inputs);
trustedUsers = [ "root" "@wheel" ]; in
extraOptions = '' {
min-free = 536870912 autoOptimiseStore = true;
keep-outputs = true gc.automatic = true;
keep-derivations = true optimise.automatic = true;
fallback = true useSandbox = true;
''; allowedUsers = [ "@wheel" ];
}; trustedUsers = [ "root" "@wheel" ];
extraOptions = ''
min-free = 536870912
keep-outputs = true
keep-derivations = true
fallback = true
'';
inherit registry;
};
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View File

@ -18,6 +18,8 @@ in
"$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/"; "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
}; };
environment.systemPackages = [ pkgs.qt5.qtwayland ];
xdg.portal = { xdg.portal = {
enable = true; enable = true;
gtkUsePortal = true; gtkUsePortal = true;