Added inputs to gcroots

This commit is contained in:
Julien Malka 2022-02-28 14:29:42 +01:00
parent 0fad8200a3
commit bce831f4fe
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
6 changed files with 19 additions and 48 deletions

39
flake.lock generated
View file

@ -16,27 +16,6 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"dns": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1635273082,
"narHash": "sha256-EHiDP2jEa7Ai5ZwIf5uld9RVFcV77+2SUxjQXwJsJa0=",
"owner": "kirelagin",
"repo": "dns.nix",
"rev": "c7b9645da9c0ddce4f9de4ef27ec01bb8108039a",
"type": "github"
},
"original": {
"owner": "kirelagin",
"repo": "dns.nix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -54,21 +33,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@ -121,7 +85,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
@ -240,7 +204,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"dns": "dns",
"home-manager": "home-manager", "home-manager": "home-manager",
"homepage": "homepage", "homepage": "homepage",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",

View file

@ -8,11 +8,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
dns = {
url = "github:kirelagin/dns.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";

View file

@ -23,6 +23,7 @@ in
root = inputs.homepage; root = inputs.homepage;
}; };
nix.gcRoots = [ inputs.homepage ];
}; };
} }

View file

@ -39,5 +39,8 @@ with lib;
sops.secrets.malkash-pw = { }; sops.secrets.malkash-pw = { };
sops.secrets.ensmailmalka-pw = { }; sops.secrets.ensmailmalka-pw = { };
sops.secrets.ensmailmondon-pw = { }; sops.secrets.ensmailmondon-pw = { };
nix.gcRoots = [ inputs.simple-nixos-mailserver ];
}; };
} }

View file

@ -8,6 +8,12 @@ with lib;
enable = mkEnableOption "Enable nix experimental"; enable = mkEnableOption "Enable nix experimental";
}; };
options.nix.gcRoots = mkOption {
description = "A list of garbage collector roots.";
type = with types; listOf path;
default = [];
};
config = mkIf cfg.enable config = mkIf cfg.enable
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -17,7 +23,7 @@ with lib;
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
}; };
package = pkgs.nixUnstable; package = pkgs.unstable.nix;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
narinfo-cache-negative-ttl = 0 narinfo-cache-negative-ttl = 0
@ -33,8 +39,9 @@ with lib;
"bin.julienmalka.me:y0uADfX8ZQ6Pthofm8Pj7v+hED3m2cY0d+Sg6/Jm+s8=" "bin.julienmalka.me:y0uADfX8ZQ6Pthofm8Pj7v+hED3m2cY0d+Sg6/Jm+s8="
]; ];
gcRoots = [ inputs.neovim-nightly-overlay inputs.nixpkgs inputs.unstable inputs.home-manager ];
}; };
environment.etc.gc-roots.text = concatMapStrings (x: x + "\n") config.nix.gcRoots;
}; };
} }

View file

@ -15,14 +15,16 @@ with lib;
path = "/home/julien/.config/ens-mail-passwd"; path = "/home/julien/.config/ens-mail-passwd";
}; };
sops.secrets.sendinblue-mail-passwd = {}; sops.secrets.sendinblue-mail-passwd = { };
sops.secrets.git-gpg-private-key = { sops.secrets.git-gpg-private-key = {
owner = "julien"; owner = "julien";
mode = "0440"; mode = "0440";
group = config.users.groups.keys.name; group = config.users.groups.keys.name;
}; };
}; nix.gcRoots = [ inputs.sops-nix ];
};
} }