commit d9bf94b864a3c0a4a65837721e2c97efdf4f7f4a · nekomimi.pet/nixcfg

+29

hosts/valefar/default.nix

···

       50
        
         boot.supportedFilesystems = [ "zfs" ];

     

       51
        
         boot.kernelModules = [ "nct6775" "coretemp" ];

     

       52
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
         services.zfs.autoScrub.enable = true;

     

       54
        
         services.zfs.trim.enable = true;

     

       55

···

       50
        
         boot.supportedFilesystems = [ "zfs" ];

     

       51
        
         boot.kernelModules = [ "nct6775" "coretemp" ];

     

       52
        
       

     

       53
       +
         boot.zfs.extraPools = [ "garage" "storage" ];

     

       54
       +
         boot.zfs.devNodes = "/dev/disk/by-id";

     

       55
       +
         boot.zfs.forceImportAll = true;

     

       56
       +
       

     

       57
       +
         systemd.services.zfs-import-cache.enable = false;

     

       58
       +
         systemd.services.zfs-import-scan.enable = true;

     

       59
       +
       

     

       60
       +
         systemd.services.zfs-import-scan = {

     

       61
       +
           after = [ "systemd-udev-settle.service" ];

     

       62
       +
           wants = [ "systemd-udev-settle.service" ];

     

       63
       +
         };

     

       64
       +
       

     

       65
       +
         systemd.mounts = [

     

       66
       +
         {

     

       67
       +
           what = "garage";

     

       68
       +
           where = "/garage";

     

       69
       +
           type = "zfs";

     

       70
       +
           after = [ "zfs-import-scan.service" ];

     

       71
       +
           wants = [ "zfs-import-scan.service" ];

     

       72
       +
         }

     

       73
       +
         {

     

       74
       +
           what = "storage";

     

       75
       +
           where = "/storage";

     

       76
       +
           type = "zfs";

     

       77
       +
           after = [ "zfs-import-scan.service" ];

     

       78
       +
           wants = [ "zfs-import-scan.service" ];

     

       79
       +
         }

     

       80
       +
       ];

     

       81
       +
       

     

       82
        
         services.zfs.autoScrub.enable = true;

     

       83
        
         services.zfs.trim.enable = true;

     

       84

+2 -2

hosts/valefar/hardware.nix

···

       24
        
             options = [ "fmask=0022" "dmask=0022" ];

     

       25
        
           };

     

       26
        
       

     

       27
       -
         fileSystems."/garage" = {

     

       28
        
           device = "garage";

     

       29
        
           fsType = "zfs";

     

       30
        
         };

     
···

       32
        
         fileSystems."/storage" = {

     

       33
        
           device = "storage";

     

       34
        
           fsType = "zfs";

     

       35
       -
         };

     

       36
        
       

     

       37
        
         swapDevices = [ ];

     

       38

···

       24
        
             options = [ "fmask=0022" "dmask=0022" ];

     

       25
        
           };

     

       26
        
       

     

       27
       +
       /*  fileSystems."/garage" = {

     

       28
        
           device = "garage";

     

       29
        
           fsType = "zfs";

     

       30
        
         };

     
···

       32
        
         fileSystems."/storage" = {

     

       33
        
           device = "storage";

     

       34
        
           fsType = "zfs";

     

       35
       +
         };*/

     

       36
        
       

     

       37
        
         swapDevices = [ ];

     

       38