commit 8ba20ed0ba47f531d1f364aff4f0162060399a80 · nel.pet/cyclamen

+20 -6

modules/nixos/lannas.nix

···

       5
        
         ...

     

       6
        
       }: let

     

       7
        
         cfg = config.cyclamen.system.lannas;

     

       0
        
       
     

       0
        
       
     

       8
        
         # TODO: secrets stuff

     

       9
        
         credFile = "/etc/nixos/nas_secrets";

     

       10
        
         rootBackupsPath = "main/backup/nel";

     
···

       37
        
           automountConfig.TimeoutIdleSec = 60;

     

       38
        
         };

     

       39
        
       in {

     

       40
       -
         options.cyclamen.system.lannas.enable = lib.mkEnableOption ''

     

       41
       -
           mounting of directories from the LAN NAS. mainly intended for backups.

     

       42
       -
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       43
        
       

     

       44
       -
         config = lib.mkIf cfg.enable {

     

       45
        
           boot.supportedFilesystems = [ "cifs" ];

     

       46
        
           # For mount.cifs, required unless domain name resolution is not needed.

     

       47
        
           environment.systemPackages = [ pkgs.cifs-utils ];

     
···

       49
        
           # We use systemd mount units directly instead of fileSystems.* to avoid infinite recursion.

     

       50
        
           # See https://github.com/NixOS/nixpkgs/issues/24570 for details

     

       51
        
           systemd = {

     

       52
       -
             mounts = (lib.lists.map usernameToMountUnit normalUsers) ++ [ (hostnameToMountUnit config.networking.hostName) ];

     

       53
       -
             automounts = (lib.lists.map usernameToAutomountUnit normalUsers) ++ [ (hostnameToAutomountUnit config.networking.hostName) ];

     

       0
        
       
     

       0
        
       
     

       54
        
           };

     

       55
        
         };

     

       56
        
       }

···

       5
        
         ...

     

       6
        
       }: let

     

       7
        
         cfg = config.cyclamen.system.lannas;

     

       8
       +
         mountUsers = if cfg.enable == "all" || cfg.enable == "users" then true else false;

     

       9
       +
         mountSystem = if cfg.enable == "all" || cfg.enable == "system" then true else false;

     

       10
        
         # TODO: secrets stuff

     

       11
        
         credFile = "/etc/nixos/nas_secrets";

     

       12
        
         rootBackupsPath = "main/backup/nel";

     
···

       39
        
           automountConfig.TimeoutIdleSec = 60;

     

       40
        
         };

     

       41
        
       in {

     

       42
       +
         options.cyclamen.system.lannas.enable = lib.mkOption {

     

       43
       +
           type = lib.types.enum [ "no" "system" "users" "all" ];

     

       44
       +
           default = "no";

     

       45
       +
           example = "all";

     

       46
       +
           description = ''

     

       47
       +
             Whether to enable mounting of directories from the LAN NAS. mainly intended for backups.

     

       48
       +
             

     

       49
       +
             "no" mounts nothing.

     

       50
       +
             "system" mounts only the system mount based on hostname.

     

       51
       +
             "users" mounts only the user mounts for isNormalUser users.

     

       52
       +
             "all" mounts both the system mount and user mount.

     

       53
       +
           '';

     

       54
       +
         };

     

       55
        
       

     

       56
       +
         config = lib.mkIf (cfg.enable != "no") {

     

       57
        
           boot.supportedFilesystems = [ "cifs" ];

     

       58
        
           # For mount.cifs, required unless domain name resolution is not needed.

     

       59
        
           environment.systemPackages = [ pkgs.cifs-utils ];

     
···

       61
        
           # We use systemd mount units directly instead of fileSystems.* to avoid infinite recursion.

     

       62
        
           # See https://github.com/NixOS/nixpkgs/issues/24570 for details

     

       63
        
           systemd = {

     

       64
       +
             mounts = (lib.lists.optionals mountUsers (lib.lists.map usernameToMountUnit normalUsers))

     

       65
       +
               ++ (lib.lists.optional mountSystem (hostnameToMountUnit config.networking.hostName));

     

       66
       +
             automounts = (lib.lists.optionals mountUsers (lib.lists.map usernameToAutomountUnit normalUsers))

     

       67
       +
               ++ (lib.lists.optional mountSystem (hostnameToAutomountUnit config.networking.hostName));

     

       68
        
           };

     

       69
        
         };

     

       70
        
       }

+1 -1

systems/nel-desktop/configuration.nix

···

       6
        
       

     

       7
        
         cyclamen = {

     

       8
        
           system = {

     

       9
       -
             lannas.enable = true;

     

       10
        
           };

     

       11
        
         };

     

       12

···

       6
        
       

     

       7
        
         cyclamen = {

     

       8
        
           system = {

     

       9
       +
             lannas.enable = "all";

     

       10
        
           };

     

       11
        
         };

     

       12