commit 42cf56db0921e70703f9e4bcd9467bf6d425a668 · pyrox.dev/nixpkgs

+68 -36

nixos/modules/config/system-path.nix

···

       8
       8
        
       }:

     

       9
       9
        
       let

     

       10
       10
        
       

     

       11
       11
       -
         requiredPackages =

     

       12
       12
       -
           map (pkg: lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg)

     

       13
       13
       -
             [

     

       14
       14
       -
               pkgs.acl

     

       15
       15
       -
               pkgs.attr

     

       16
       16
       -
               pkgs.bashInteractive # bash with ncurses support

     

       17
       17
       -
               pkgs.bzip2

     

       18
       18
       -
               pkgs.coreutils-full

     

       19
       19
       -
               pkgs.cpio

     

       20
       20
       -
               pkgs.curl

     

       21
       21
       -
               pkgs.diffutils

     

       22
       22
       -
               pkgs.findutils

     

       23
       23
       -
               pkgs.gawk

     

       24
       24
       -
               pkgs.stdenv.cc.libc

     

       25
       25
       -
               pkgs.getent

     

       26
       26
       -
               pkgs.getconf

     

       27
       27
       -
               pkgs.gnugrep

     

       28
       28
       -
               pkgs.gnupatch

     

       29
       29
       -
               pkgs.gnused

     

       30
       30
       -
               pkgs.gnutar

     

       31
       31
       -
               pkgs.gzip

     

       32
       32
       -
               pkgs.xz

     

       33
       33
       -
               pkgs.less

     

       34
       34
       -
               pkgs.libcap

     

       35
       35
       -
               pkgs.ncurses

     

       36
       36
       -
               pkgs.netcat

     

       37
       37
       -
               config.programs.ssh.package

     

       38
       38
       -
               pkgs.mkpasswd

     

       39
       39
       -
               pkgs.procps

     

       40
       40
       -
               pkgs.su

     

       41
       41
       -
               pkgs.time

     

       42
       42
       -
               pkgs.util-linux

     

       43
       43
       -
               pkgs.which

     

       44
       44
       -
               pkgs.zstd

     

       45
       45
       -
             ];

     

       11
       11
       +
         corePackageNames = [

     

       12
       12
       +
           "acl"

     

       13
       13
       +
           "attr"

     

       14
       14
       +
           "bashInteractive" # bash with ncurses support

     

       15
       15
       +
           "bzip2"

     

       16
       16
       +
           "coreutils-full"

     

       17
       17
       +
           "cpio"

     

       18
       18
       +
           "curl"

     

       19
       19
       +
           "diffutils"

     

       20
       20
       +
           "findutils"

     

       21
       21
       +
           "gawk"

     

       22
       22
       +
           "getent"

     

       23
       23
       +
           "getconf"

     

       24
       24
       +
           "gnugrep"

     

       25
       25
       +
           "gnupatch"

     

       26
       26
       +
           "gnused"

     

       27
       27
       +
           "gnutar"

     

       28
       28
       +
           "gzip"

     

       29
       29
       +
           "xz"

     

       30
       30
       +
           "less"

     

       31
       31
       +
           "libcap"

     

       32
       32
       +
           "ncurses"

     

       33
       33
       +
           "netcat"

     

       34
       34
       +
           "mkpasswd"

     

       35
       35
       +
           "procps"

     

       36
       36
       +
           "su"

     

       37
       37
       +
           "time"

     

       38
       38
       +
           "util-linux"

     

       39
       39
       +
           "which"

     

       40
       40
       +
           "zstd"

     

       41
       41
       +
         ];

     

       42
       42
       +
         corePackages =

     

       43
       43
       +
           (map (

     

       44
       44
       +
             n:

     

       45
       45
       +
             let

     

       46
       46
       +
               pkg = pkgs.${n};

     

       47
       47
       +
             in

     

       48
       48
       +
             lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg

     

       49
       49
       +
           ) corePackageNames)

     

       50
       50
       +
           ++ [ pkgs.stdenv.cc.libc ];

     

       51
       51
       +
         corePackagesText = "[ ${lib.concatMapStringsSep " " (n: "pkgs.${n}") corePackageNames} ]";

     

       46
       52
        
       

     

       47
       53
        
         defaultPackageNames = [

     

       48
       54
        
           "perl"

     
···

       80
       86
        
               '';

     

       81
       87
        
             };

     

       82
       88
        
       

     

       89
       89
       +
             corePackages = lib.mkOption {

     

       90
       90
       +
               type = lib.types.listOf lib.types.package;

     

       91
       91
       +
               defaultText = lib.literalMD ''

     

       92
       92
       +
                 these packages, with their `meta.priority` numerically increased

     

       93
       93
       +
                 (thus lowering their installation priority):

     

       94
       94
       +
       

     

       95
       95
       +
                     ${corePackagesText}

     

       96
       96
       +
               '';

     

       97
       97
       +
               example = [ ];

     

       98
       98
       +
               description = ''

     

       99
       99
       +
                 Set of core packages for a normal interactive system.

     

       100
       100
       +
       

     

       101
       101
       +
                 Only change this if you know what you're doing!

     

       102
       102
       +
       

     

       103
       103
       +
                 Like with systemPackages, packages are installed to

     

       104
       104
       +
                 {file}`/run/current-system/sw`. They are

     

       105
       105
       +
                 automatically available to all users, and are

     

       106
       106
       +
                 automatically updated every time you rebuild the system

     

       107
       107
       +
                 configuration.

     

       108
       108
       +
               '';

     

       109
       109
       +
             };

     

       110
       110
       +
       

     

       83
       111
        
             defaultPackages = lib.mkOption {

     

       84
       112
        
               type = lib.types.listOf lib.types.package;

     

       85
       113
        
               default = defaultPackages;

     
···

       151
       179
        
       

     

       152
       180
        
         config = {

     

       153
       181
        
       

     

       154
       154
       -
           environment.systemPackages = requiredPackages ++ config.environment.defaultPackages;

     

       182
       182
       +
           # Set this here so that it has the right priority and allows ergonomic

     

       183
       183
       +
           # merging.

     

       184
       184
       +
           environment.corePackages = corePackages;

     

       185
       185
       +
       

     

       186
       186
       +
           environment.systemPackages = config.environment.corePackages ++ config.environment.defaultPackages;

     

       155
       187
        
       

     

       156
       188
        
           environment.pathsToLink = [

     

       157
       189
        
             "/bin"

nixos/modules/programs/ssh.nix

···

       335
       335
        
             }

     

       336
       336
        
           );

     

       337
       337
        
       

     

       338
       338
       +
           environment.corePackages = [ cfg.package ];

     

       339
       339
       +
       

     

       338
       340
        
           # SSH configuration. Slight duplication of the sshd_config

     

       339
       341
        
           # generation in the sshd service.

     

       340
       342
        
           environment.etc."ssh/ssh_config".text = ''