commit 8acd72f9af2a960cb6bef6b1561a35ad56276f01 · nel.pet/cyclamen

+5

modules/nixos/system/boot/default.nix

···

       1
       +
       {

     

       2
       +
         imports = [

     

       3
       +
           ./loader.nix

     

       4
       +
         ];

     

       5
       +
       }

+26

modules/nixos/system/boot/loader.nix

···

       1
       +
       { lib, config, ... }: let

     

       2
       +
         cfg = config.cyclamen.system.boot.loader;

     

       3
       +
       in {

     

       4
       +
         options.cyclamen.system.boot.loader = lib.mkOption {

     

       5
       +
           type = lib.types.enum [

     

       6
       +
             "systemd-boot"

     

       7
       +
           ];

     

       8
       +
           default = "systemd-boot";

     

       9
       +
           description = "The bootloader to be used on this system.";

     

       10
       +
         };

     

       11
       +
       

     

       12
       +
         config = lib.mkMerge [

     

       13
       +
           {

     

       14
       +
             boot.loader.efi.canTouchEfiVariables = true;

     

       15
       +
           }

     

       16
       +
       

     

       17
       +
           (lib.mkIf (cfg == "systemd-boot") {

     

       18
       +
             boot.loader.systemd-boot = {

     

       19
       +
               enable = true;

     

       20
       +
       

     

       21
       +
               # See option description

     

       22
       +
               editor = false;

     

       23
       +
             };

     

       24
       +
           })

     

       25
       +
         ];

     

       26
       +
       }

+1

modules/nixos/system/default.nix

···

       1
        
       {

     

       2
        
         imports = [

     

       0
        
       
     

       3
        
           ./lannas.nix

     

       4
        
         ];

     

       5
        
       }

···

       1
        
       {

     

       2
        
         imports = [

     

       3
       +
           ./boot

     

       4
        
           ./lannas.nix

     

       5
        
         ];

     

       6
        
       }

+5 -5

systems/nel-desktop/configuration.nix

···

       5
        
         ];

     

       6
        
       

     

       7
        
         cyclamen = {

     

       8
       -
           system = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
             lannas.enable = "all";

     

       10
        
           };

     

       11
        
         };

     

       12
       -
       

     

       13
       -
         # Bootloader.

     

       14
       -
         boot.loader.systemd-boot.enable = true;

     

       15
       -
         boot.loader.efi.canTouchEfiVariables = true;

     

       16
        
       

     

       17
        
         networking.hostName = "nel-desktop";

     

       18
        
         networking.networkmanager.enable = true;

···

       5
        
         ];

     

       6
        
       

     

       7
        
         cyclamen = {

     

       8
       +
           system = { # Tuber

     

       9
       +
             boot = { # Roots

     

       10
       +
               loader = "systemd-boot";

     

       11
       +
             };

     

       12
       +
       

     

       13
        
             lannas.enable = "all";

     

       14
        
           };

     

       15
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         networking.hostName = "nel-desktop";

     

       18
        
         networking.networkmanager.enable = true;