commit f182fdf6ed3acf820a5f619eda9bffee1ecd1c46 · pyrox.dev/nixpkgs

nixos/doc/manual/man-nixos-generate-config.xml

···

       118
       118
        
           </listitem>

     

       119
       119
        
         </varlistentry>

     

       120
       120
        
       

     

       121
       121
       +
         <varlistentry>

     

       122
       122
       +
           <term><option>--show-hardware-config</option></term>

     

       123
       123
       +
           <listitem>

     

       124
       124
       +
             <para>Don't generate <filename>configuration.nix</filename> or

     

       125
       125
       +
             <filename>hardware-configuration.nix</filename> and print the

     

       126
       126
       +
             hardware configuration to stdout only.</para>

     

       127
       127
       +
           </listitem>

     

       128
       128
       +
         </varlistentry>

     

       129
       129
       +
       

     

       121
       130
        
       </variablelist>

     

       122
       131
        
       

     

       123
       132
        
       </refsection>

+28 -19

nixos/modules/installer/tools/nixos-generate-config.pl

···

       24
       24
        
       my $rootDir = ""; # = /

     

       25
       25
        
       my $force = 0;

     

       26
       26
        
       my $noFilesystems = 0;

     

       27
       27
       +
       my $showHardwareConfig = 0;

     

       27
       28
        
       

     

       28
       29
        
       for (my $n = 0; $n < scalar @ARGV; $n++) {

     

       29
       30
        
           my $arg = $ARGV[$n];

     
···

       46
       47
        
           }

     

       47
       48
        
           elsif ($arg eq "--no-filesystems") {

     

       48
       49
        
               $noFilesystems = 1;

     

       50
       50
       +
           }

     

       51
       51
       +
           elsif ($arg eq "--show-hardware-config") {

     

       52
       52
       +
               $showHardwareConfig = 1;

     

       49
       53
        
           }

     

       50
       54
        
           else {

     

       51
       55
        
               die "$0: unrecognized argument ‘$arg’\n";

     
···

       336
       340
        
       my $kernelModules = toNixExpr(uniq @kernelModules);

     

       337
       341
        
       my $modulePackages = toNixExpr(uniq @modulePackages);

     

       338
       342
        
       

     

       339
       339
       -
       $outDir = "$rootDir$outDir";

     

       340
       340
       -
       

     

       341
       341
       -
       my $fn = "$outDir/hardware-configuration.nix";

     

       342
       342
       -
       print STDERR "writing $fn...\n";

     

       343
       343
       -
       mkpath($outDir, 0, 0755);

     

       344
       344
       -
       

     

       345
       343
        
       my $fsAndSwap = "";

     

       346
       344
        
       if (!$noFilesystems) {

     

       347
       345
        
           $fsAndSwap = "\n${fileSystems}  ";

     

       348
       346
        
           $fsAndSwap .= "swapDevices =" . multiLineList("    ", @swapDevices) . ";\n";

     

       349
       347
        
       }

     

       350
       348
        
       

     

       351
       351
       -
       write_file($fn, <<EOF);

     

       349
       349
       +
       my $hwConfig = <<EOF;

     

       352
       350
        
       # Do not modify this file!  It was generated by ‘nixos-generate-config’

     

       353
       351
        
       # and may be overwritten by future invocations.  Please make changes

     

       354
       352
        
       # to /etc/nixos/configuration.nix instead.

     
···

       366
       364
        
       EOF

     

       367
       365
        
       

     

       368
       366
        
       

     

       369
       369
       -
       # Generate a basic configuration.nix, unless one already exists.

     

       370
       370
       -
       $fn = "$outDir/configuration.nix";

     

       371
       371
       -
       if ($force || ! -e $fn) {

     

       367
       367
       +
       if ($showHardwareConfig) {

     

       368
       368
       +
           print STDOUT $hwConfig;

     

       369
       369
       +
       } else {

     

       370
       370
       +
           $outDir = "$rootDir$outDir";

     

       371
       371
       +
       

     

       372
       372
       +
           my $fn = "$outDir/hardware-configuration.nix";

     

       372
       373
        
           print STDERR "writing $fn...\n";

     

       374
       374
       +
           mkpath($outDir, 0, 0755);

     

       375
       375
       +
           write_file($fn, $hwConfig);

     

       373
       376
        
       

     

       374
       374
       -
           my $bootloaderConfig;

     

       375
       375
       -
           if (-e "/sys/firmware/efi/efivars") {

     

       376
       376
       -
               $bootLoaderConfig = <<EOF;

     

       377
       377
       +
           # Generate a basic configuration.nix, unless one already exists.

     

       378
       378
       +
           $fn = "$outDir/configuration.nix";

     

       379
       379
       +
           if ($force || ! -e $fn) {

     

       380
       380
       +
               print STDERR "writing $fn...\n";

     

       381
       381
       +
       

     

       382
       382
       +
               my $bootloaderConfig;

     

       383
       383
       +
               if (-e "/sys/firmware/efi/efivars") {

     

       384
       384
       +
                   $bootLoaderConfig = <<EOF;

     

       377
       385
        
         # Use the gummiboot efi boot loader.

     

       378
       386
        
         boot.loader.grub.enable = false;

     

       379
       387
        
         boot.loader.gummiboot.enable = true;

     
···

       382
       390
        
         # EFI booting requires kernel >= 3.10

     

       383
       391
        
         boot.kernelPackages = pkgs.linuxPackages_3_10;

     

       384
       392
        
       EOF

     

       385
       385
       -
           } else {

     

       386
       386
       -
               $bootLoaderConfig = <<EOF;

     

       393
       393
       +
               } else {

     

       394
       394
       +
                   $bootLoaderConfig = <<EOF;

     

       387
       395
        
         # Use the GRUB 2 boot loader.

     

       388
       396
        
         boot.loader.grub.enable = true;

     

       389
       397
        
         boot.loader.grub.version = 2;

     

       390
       398
        
         # Define on which hard drive you want to install Grub.

     

       391
       399
        
         # boot.loader.grub.device = "/dev/sda";

     

       392
       400
        
       EOF

     

       393
       393
       -
           }

     

       401
       401
       +
               }

     

       394
       402
        
       

     

       395
       395
       -
           write_file($fn, <<EOF);

     

       403
       403
       +
               write_file($fn, <<EOF);

     

       396
       404
        
       # Edit this configuration file to define what should be installed on

     

       397
       405
        
       # your system.  Help is available in the configuration.nix(5) man page

     

       398
       406
        
       # and in the NixOS manual (accessible by running ‘nixos-help’).

     
···

       453
       461
        
         # services.xserver.desktopManager.kde4.enable = true;

     

       454
       462
        
       }

     

       455
       463
        
       EOF

     

       456
       456
       -
       } else {

     

       457
       457
       -
           print STDERR "warning: not overwriting existing $fn\n";

     

       464
       464
       +
           } else {

     

       465
       465
       +
               print STDERR "warning: not overwriting existing $fn\n";

     

       466
       466
       +
           }

     

       458
       467
        
       }

     

       459
       468
        
       

     

       460
       469
        
       # workaround for a bug in substituteAll