chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move some zfs stuff around

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-11-15 13:06:50 +01:00
parent fcb5af7894
commit 3e09cc7444
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configurations/docker.nix
View file

@ -1,11 +1,12 @@
{ ... }: { ... }:
{ {
chvp.zfs.systemLinks = [ virtualisation.docker = {
{ path = "/var/lib/docker"; type = "cache"; } enable = true;
{ path = "/var/lib/docker/volumes"; type = "data"; } extraOptions = "--data-root /data/var/lib/docker";
]; storageDriver = "zfs";
virtualisation.docker.enable = true; };
users.users.charlotte.extraGroups = [ users.users.charlotte.extraGroups = [
"docker" "docker"
]; ];

2
modules/zfs.nix
View file

@ -41,8 +41,6 @@ in
''; '';
}; };
config.virtualisation.docker.storageDriver = lib.mkIf config.chvp.zfs.enable "zfs";
config.services.zfs.autoScrub.enable = config.chvp.zfs.enable; config.services.zfs.autoScrub.enable = config.chvp.zfs.enable;
config.services.zfs.trim.enable = config.chvp.zfs.enable; config.services.zfs.trim.enable = config.chvp.zfs.enable;

4
profiles/common.nix
View file

@ -19,10 +19,6 @@
../configurations/zsh.nix ../configurations/zsh.nix
]; ];
chvp.zfs.systemLinks = [
{ path = "/root/.ssh"; type = "data"; }
];
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.charlotte = { pkgs, ... }: { home-manager.users.charlotte = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [