commit 1bb040fae871ed638a64e4da7c76e3b8674d3e63 · pyrox.dev/nixpkgs

+65 -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"

     
···

       77
       83
        
                 configuration.  (The latter is the main difference with

     

       78
       84
        
                 installing them in the default profile,

     

       79
       85
        
                 {file}`/nix/var/nix/profiles/default`.

     

       86
       86
       +
               '';

     

       87
       87
       +
             };

     

       88
       88
       +
       

     

       89
       89
       +
             corePackages = lib.mkOption {

     

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

     

       91
       91
       +
               default = corePackages;

     

       92
       92
       +
               defaultText = lib.literalMD ''

     

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

     

       94
       94
       +
                 (thus lowering their installation priority):

     

       95
       95
       +
       

     

       96
       96
       +
                     ${corePackagesText}

     

       97
       97
       +
               '';

     

       98
       98
       +
               example = [ ];

     

       99
       99
       +
               description = ''

     

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

     

       101
       101
       +
       

     

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

     

       103
       103
       +
       

     

       104
       104
       +
                 Like with systemPackages, packages are installed to

     

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

     

       106
       106
       +
                 automatically available to all users, and are

     

       107
       107
       +
                 automatically updated every time you rebuild the system

     

       108
       108
       +
                 configuration.

     

       80
       109
        
               '';

     

       81
       110
        
             };

     

       82
       111
        
       

     
···

       151
       180
        
       

     

       152
       181
        
         config = {

     

       153
       182
        
       

     

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

     

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

     

       155
       184
        
       

     

       156
       185
        
           environment.pathsToLink = [

     

       157
       186
        
             "/bin"

+97 -103

nixos/modules/programs/bash/bash.nix

···

       23
       23
        
       in

     

       24
       24
        
       

     

       25
       25
        
       {

     

       26
       26
       -
         imports = [

     

       27
       27
       -
           (lib.mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

     

       28
       28
       -
         ];

     

       29
       26
        
       

     

       30
       27
        
         options = {

     

       31
       28
        
       

     

       32
       29
        
           programs.bash = {

     

       33
       30
        
       

     

       34
       34
       -
             /*

     

       35
       35
       -
               enable = lib.mkOption {

     

       36
       36
       -
                 default = true;

     

       37
       37
       -
                 description = ''

     

       38
       38
       -
                   Whenever to configure Bash as an interactive shell.

     

       39
       39
       -
                   Note that this tries to make Bash the default

     

       40
       40
       -
                   {option}`users.defaultUserShell`,

     

       41
       41
       -
                   which in turn means that you might need to explicitly

     

       42
       42
       -
                   set this variable if you have another shell configured

     

       43
       43
       -
                   with NixOS.

     

       44
       44
       -
                 '';

     

       45
       45
       -
                 type = lib.types.bool;

     

       46
       46
       -
               };

     

       47
       47
       -
             */

     

       31
       31
       +
             enable = lib.mkOption {

     

       32
       32
       +
               default = true;

     

       33
       33
       +
               description = ''

     

       34
       34
       +
                 Whenever to configure Bash as an interactive shell.

     

       35
       35
       +
                 Note that this tries to make Bash the default

     

       36
       36
       +
                 {option}`users.defaultUserShell`,

     

       37
       37
       +
                 which in turn means that you might need to explicitly

     

       38
       38
       +
                 set this variable if you have another shell configured

     

       39
       39
       +
                 with NixOS.

     

       40
       40
       +
               '';

     

       41
       41
       +
               type = lib.types.bool;

     

       42
       42
       +
             };

     

       48
       43
        
       

     

       49
       44
        
             shellAliases = lib.mkOption {

     

       50
       45
        
               default = { };

     
···

       129
       124
        
       

     

       130
       125
        
         };

     

       131
       126
        
       

     

       132
       132
       -
         config = # lib.mkIf cfg.enable

     

       133
       133
       -
           {

     

       127
       127
       +
         config = lib.mkIf cfg.enable {

     

       134
       128
        
       

     

       135
       135
       -
             programs.bash = {

     

       129
       129
       +
           programs.bash = {

     

       136
       130
        
       

     

       137
       137
       -
               shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;

     

       131
       131
       +
             shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;

     

       138
       132
        
       

     

       139
       139
       -
               shellInit = ''

     

       140
       140
       -
                 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then

     

       141
       141
       -
                     . ${config.system.build.setEnvironment}

     

       142
       142
       -
                 fi

     

       133
       133
       +
             shellInit = ''

     

       134
       134
       +
               if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then

     

       135
       135
       +
                   . ${config.system.build.setEnvironment}

     

       136
       136
       +
               fi

     

       143
       137
        
       

     

       144
       144
       -
                 ${cfge.shellInit}

     

       145
       145
       -
               '';

     

       138
       138
       +
               ${cfge.shellInit}

     

       139
       139
       +
             '';

     

       146
       140
        
       

     

       147
       147
       -
               loginShellInit = cfge.loginShellInit;

     

       141
       141
       +
             loginShellInit = cfge.loginShellInit;

     

       148
       142
        
       

     

       149
       149
       -
               interactiveShellInit = ''

     

       150
       150
       -
                 # Check the window size after every command.

     

       151
       151
       -
                 shopt -s checkwinsize

     

       143
       143
       +
             interactiveShellInit = ''

     

       144
       144
       +
               # Check the window size after every command.

     

       145
       145
       +
               shopt -s checkwinsize

     

       152
       146
        
       

     

       153
       153
       -
                 # Disable hashing (i.e. caching) of command lookups.

     

       154
       154
       -
                 set +h

     

       147
       147
       +
               # Disable hashing (i.e. caching) of command lookups.

     

       148
       148
       +
               set +h

     

       155
       149
        
       

     

       156
       156
       -
                 ${cfg.promptInit}

     

       157
       157
       -
                 ${cfg.promptPluginInit}

     

       158
       158
       -
                 ${bashAliases}

     

       150
       150
       +
               ${cfg.promptInit}

     

       151
       151
       +
               ${cfg.promptPluginInit}

     

       152
       152
       +
               ${bashAliases}

     

       159
       153
        
       

     

       160
       160
       -
                 ${cfge.interactiveShellInit}

     

       161
       161
       -
               '';

     

       154
       154
       +
               ${cfge.interactiveShellInit}

     

       155
       155
       +
             '';

     

       162
       156
        
       

     

       163
       163
       -
             };

     

       157
       157
       +
           };

     

       164
       158
        
       

     

       165
       165
       -
             environment.etc.profile.text = ''

     

       166
       166
       -
               # /etc/profile: DO NOT EDIT -- this file has been generated automatically.

     

       167
       167
       -
               # This file is read for login shells.

     

       159
       159
       +
           environment.etc.profile.text = ''

     

       160
       160
       +
             # /etc/profile: DO NOT EDIT -- this file has been generated automatically.

     

       161
       161
       +
             # This file is read for login shells.

     

       168
       162
        
       

     

       169
       169
       -
               # Only execute this file once per shell.

     

       170
       170
       -
               if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi

     

       171
       171
       -
               __ETC_PROFILE_SOURCED=1

     

       163
       163
       +
             # Only execute this file once per shell.

     

       164
       164
       +
             if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi

     

       165
       165
       +
             __ETC_PROFILE_SOURCED=1

     

       172
       166
        
       

     

       173
       173
       -
               # Prevent this file from being sourced by interactive non-login child shells.

     

       174
       174
       -
               export __ETC_PROFILE_DONE=1

     

       167
       167
       +
             # Prevent this file from being sourced by interactive non-login child shells.

     

       168
       168
       +
             export __ETC_PROFILE_DONE=1

     

       175
       169
        
       

     

       176
       176
       -
               ${cfg.shellInit}

     

       177
       177
       -
               ${cfg.loginShellInit}

     

       170
       170
       +
             ${cfg.shellInit}

     

       171
       171
       +
             ${cfg.loginShellInit}

     

       178
       172
        
       

     

       179
       179
       -
               # Read system-wide modifications.

     

       180
       180
       -
               if test -f /etc/profile.local; then

     

       181
       181
       -
                   . /etc/profile.local

     

       182
       182
       -
               fi

     

       173
       173
       +
             # Read system-wide modifications.

     

       174
       174
       +
             if test -f /etc/profile.local; then

     

       175
       175
       +
                 . /etc/profile.local

     

       176
       176
       +
             fi

     

       183
       177
        
       

     

       184
       184
       -
               if [ -n "''${BASH_VERSION:-}" ]; then

     

       185
       185
       -
                   . /etc/bashrc

     

       186
       186
       -
               fi

     

       187
       187
       -
             '';

     

       178
       178
       +
             if [ -n "''${BASH_VERSION:-}" ]; then

     

       179
       179
       +
                 . /etc/bashrc

     

       180
       180
       +
             fi

     

       181
       181
       +
           '';

     

       188
       182
        
       

     

       189
       189
       -
             environment.etc.bashrc.text = ''

     

       190
       190
       -
               # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.

     

       183
       183
       +
           environment.etc.bashrc.text = ''

     

       184
       184
       +
             # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.

     

       191
       185
        
       

     

       192
       192
       -
               # Only execute this file once per shell.

     

       193
       193
       -
               if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi

     

       194
       194
       -
               __ETC_BASHRC_SOURCED=1

     

       186
       186
       +
             # Only execute this file once per shell.

     

       187
       187
       +
             if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi

     

       188
       188
       +
             __ETC_BASHRC_SOURCED=1

     

       195
       189
        
       

     

       196
       196
       -
               # If the profile was not loaded in a parent process, source

     

       197
       197
       -
               # it.  But otherwise don't do it because we don't want to

     

       198
       198
       -
               # clobber overridden values of $PATH, etc.

     

       199
       199
       -
               if [ -z "$__ETC_PROFILE_DONE" ]; then

     

       200
       200
       -
                   . /etc/profile

     

       201
       201
       -
               fi

     

       190
       190
       +
             # If the profile was not loaded in a parent process, source

     

       191
       191
       +
             # it.  But otherwise don't do it because we don't want to

     

       192
       192
       +
             # clobber overridden values of $PATH, etc.

     

       193
       193
       +
             if [ -z "$__ETC_PROFILE_DONE" ]; then

     

       194
       194
       +
                 . /etc/profile

     

       195
       195
       +
             fi

     

       202
       196
        
       

     

       203
       203
       -
               # We are not always an interactive shell.

     

       204
       204
       -
               if [ -n "$PS1" ]; then

     

       205
       205
       -
                   ${cfg.interactiveShellInit}

     

       206
       206
       -
               fi

     

       197
       197
       +
             # We are not always an interactive shell.

     

       198
       198
       +
             if [ -n "$PS1" ]; then

     

       199
       199
       +
                 ${cfg.interactiveShellInit}

     

       200
       200
       +
             fi

     

       207
       201
        
       

     

       208
       208
       -
               # Read system-wide modifications.

     

       209
       209
       -
               if test -f /etc/bashrc.local; then

     

       210
       210
       -
                   . /etc/bashrc.local

     

       211
       211
       -
               fi

     

       212
       212
       -
             '';

     

       202
       202
       +
             # Read system-wide modifications.

     

       203
       203
       +
             if test -f /etc/bashrc.local; then

     

       204
       204
       +
                 . /etc/bashrc.local

     

       205
       205
       +
             fi

     

       206
       206
       +
           '';

     

       213
       207
        
       

     

       214
       214
       -
             environment.etc.bash_logout.text = ''

     

       215
       215
       -
               # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.

     

       208
       208
       +
           environment.etc.bash_logout.text = ''

     

       209
       209
       +
             # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.

     

       216
       210
        
       

     

       217
       217
       -
               # Only execute this file once per shell.

     

       218
       218
       -
               if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi

     

       219
       219
       -
               __ETC_BASHLOGOUT_SOURCED=1

     

       211
       211
       +
             # Only execute this file once per shell.

     

       212
       212
       +
             if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi

     

       213
       213
       +
             __ETC_BASHLOGOUT_SOURCED=1

     

       220
       214
        
       

     

       221
       221
       -
               ${cfg.logout}

     

       215
       215
       +
             ${cfg.logout}

     

       222
       216
        
       

     

       223
       223
       -
               # Read system-wide modifications.

     

       224
       224
       -
               if test -f /etc/bash_logout.local; then

     

       225
       225
       -
                   . /etc/bash_logout.local

     

       226
       226
       -
               fi

     

       227
       227
       -
             '';

     

       217
       217
       +
             # Read system-wide modifications.

     

       218
       218
       +
             if test -f /etc/bash_logout.local; then

     

       219
       219
       +
                 . /etc/bash_logout.local

     

       220
       220
       +
             fi

     

       221
       221
       +
           '';

     

       228
       222
        
       

     

       229
       229
       -
             # Configuration for readline in bash. We use "option default"

     

       230
       230
       -
             # priority to allow user override using both .text and .source.

     

       231
       231
       -
             environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;

     

       223
       223
       +
           # Configuration for readline in bash. We use "option default"

     

       224
       224
       +
           # priority to allow user override using both .text and .source.

     

       225
       225
       +
           environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;

     

       232
       226
        
       

     

       233
       233
       -
             users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;

     

       227
       227
       +
           users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;

     

       234
       228
        
       

     

       235
       235
       -
             environment.pathsToLink = lib.optionals cfg.completion.enable [

     

       236
       236
       -
               "/etc/bash_completion.d"

     

       237
       237
       -
               "/share/bash-completion"

     

       238
       238
       -
             ];

     

       229
       229
       +
           environment.pathsToLink = lib.optionals cfg.completion.enable [

     

       230
       230
       +
             "/etc/bash_completion.d"

     

       231
       231
       +
             "/share/bash-completion"

     

       232
       232
       +
           ];

     

       239
       233
        
       

     

       240
       240
       -
             environment.shells = [

     

       241
       241
       -
               "/run/current-system/sw/bin/bash"

     

       242
       242
       -
               "/run/current-system/sw/bin/sh"

     

       243
       243
       -
               "${pkgs.bashInteractive}/bin/bash"

     

       244
       244
       -
               "${pkgs.bashInteractive}/bin/sh"

     

       245
       245
       -
             ];

     

       234
       234
       +
           environment.shells = [

     

       235
       235
       +
             "/run/current-system/sw/bin/bash"

     

       236
       236
       +
             "/run/current-system/sw/bin/sh"

     

       237
       237
       +
             "${pkgs.bashInteractive}/bin/bash"

     

       238
       238
       +
             "${pkgs.bashInteractive}/bin/sh"

     

       239
       239
       +
           ];

     

       246
       240
        
       

     

       247
       247
       -
           };

     

       241
       241
       +
         };

     

       248
       242
        
       

     

       249
       243
        
       }

+31 -2

nixos/modules/programs/fuse.nix

···

       1
       1
       -
       { config, lib, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       let

     

       4
       9
        
         cfg = config.programs.fuse;

     
···

       7
       12
        
         meta.maintainers = with lib.maintainers; [ ];

     

       8
       13
        
       

     

       9
       14
        
         options.programs.fuse = {

     

       15
       15
       +
           enable = lib.mkEnableOption "fuse" // {

     

       16
       16
       +
             default = true;

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       10
       19
        
           mountMax = lib.mkOption {

     

       11
       20
        
             # In the C code it's an "int" (i.e. signed and at least 16 bit), but

     

       12
       21
        
             # negative numbers obviously make no sense:

     
···

       27
       36
        
           };

     

       28
       37
        
         };

     

       29
       38
        
       

     

       30
       30
       -
         config = {

     

       39
       39
       +
         config = lib.mkIf cfg.enable {

     

       40
       40
       +
           environment.systemPackages = [

     

       41
       41
       +
             pkgs.fuse

     

       42
       42
       +
             pkgs.fuse3

     

       43
       43
       +
           ];

     

       44
       44
       +
       

     

       45
       45
       +
           security.wrappers =

     

       46
       46
       +
             let

     

       47
       47
       +
               mkSetuidRoot = source: {

     

       48
       48
       +
                 setuid = true;

     

       49
       49
       +
                 owner = "root";

     

       50
       50
       +
                 group = "root";

     

       51
       51
       +
                 inherit source;

     

       52
       52
       +
               };

     

       53
       53
       +
             in

     

       54
       54
       +
             {

     

       55
       55
       +
               fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";

     

       56
       56
       +
               fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       31
       59
        
           environment.etc."fuse.conf".text = ''

     

       32
       60
        
             ${lib.optionalString (!cfg.userAllowOther) "#"}user_allow_other

     

       33
       61
        
             mount_max = ${builtins.toString cfg.mountMax}

     

       34
       62
        
           '';

     

       63
       63
       +
       

     

       35
       64
        
         };

     

       36
       65
        
       }

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 = ''

-2

nixos/modules/security/wrappers/default.nix

···

       266
       266
        
             in

     

       267
       267
        
             {

     

       268
       268
        
               # These are mount related wrappers that require the +s permission.

     

       269
       269
       -
               fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";

     

       270
       270
       -
               fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";

     

       271
       269
        
               mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";

     

       272
       270
        
               umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";

     

       273
       271
        
             };

+1 -1

nixos/modules/system/activation/activation-script.nix

···

       317
       317
        
             source ${config.system.build.earlyMountScript}

     

       318
       318
        
           '';

     

       319
       319
        
       

     

       320
       320
       -
           systemd.user = {

     

       320
       320
       +
           systemd.user = lib.mkIf config.system.activatable {

     

       321
       321
        
             services.nixos-activation = {

     

       322
       322
        
               description = "Run user-specific NixOS activation";

     

       323
       323
        
               script = config.system.userActivationScripts.script;

+3 -1

nixos/modules/system/boot/kernel.nix

···

       414
       414
        
       

     

       415
       415
        
                 ln -s ${initrdPath} $out/initrd

     

       416
       416
        
       

     

       417
       417
       -
                 ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out

     

       417
       417
       +
                 ${optionalString (config.boot.initrd.secrets != { }) ''

     

       418
       418
       +
                   ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out

     

       419
       419
       +
                 ''}

     

       418
       420
        
       

     

       419
       421
        
                 ln -s ${config.hardware.firmware}/lib/firmware $out/firmware

     

       420
       422
        
               '';

+17 -2

nixos/modules/system/boot/kexec.nix

···

       1
       1
       -
       { pkgs, lib, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.boot.kexec;

     

       10
       10
       +
       in

     

       3
       11
        
       {

     

       4
       4
       -
         config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {

     

       12
       12
       +
         options.boot.kexec = {

     

       13
       13
       +
           enable = lib.mkEnableOption "kexec" // {

     

       14
       14
       +
             default = lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools;

     

       15
       15
       +
             defaultText = lib.literalExpression ''lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools'';

     

       16
       16
       +
           };

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         config = lib.mkIf cfg.enable {

     

       5
       20
        
           environment.systemPackages = [ pkgs.kexec-tools ];

     

       6
       21
        
       

     

       7
       22
        
           systemd.services.prepare-kexec = {

+1 -7

nixos/modules/tasks/filesystems.nix

···

       461
       461
        
           # Add the mount helpers to the system path so that `mount' can find them.

     

       462
       462
        
           system.fsPackages = [ pkgs.dosfstools ];

     

       463
       463
        
       

     

       464
       464
       -
           environment.systemPackages =

     

       465
       465
       -
             with pkgs;

     

       466
       466
       -
             [

     

       467
       467
       -
               fuse3

     

       468
       468
       -
               fuse

     

       469
       469
       -
             ]

     

       470
       470
       -
             ++ config.system.fsPackages;

     

       464
       464
       +
           environment.systemPackages = config.system.fsPackages;

     

       471
       465
        
       

     

       472
       466
        
           environment.etc.fstab.text =

     

       473
       467
        
             let

+13 -11

nixos/modules/tasks/network-interfaces.nix

···

       1767
       1767
        
             text = cfg.hostName + "\n";

     

       1768
       1768
        
           };

     

       1769
       1769
        
       

     

       1770
       1770
       -
           environment.systemPackages = [

     

       1771
       1771
       -
             pkgs.host

     

       1772
       1772
       -
             pkgs.hostname-debian

     

       1773
       1773
       -
             pkgs.iproute2

     

       1774
       1774
       -
             pkgs.iputils

     

       1775
       1775
       -
           ]

     

       1776
       1776
       -
           ++ optionals config.networking.wireless.enable [

     

       1777
       1777
       -
             pkgs.wirelesstools # FIXME: obsolete?

     

       1778
       1778
       -
             pkgs.iw

     

       1779
       1779
       -
           ]

     

       1780
       1780
       -
           ++ bridgeStp;

     

       1770
       1770
       +
           environment.corePackages = lib.mkOptionDefault (

     

       1771
       1771
       +
             [

     

       1772
       1772
       +
               pkgs.host

     

       1773
       1773
       +
               pkgs.hostname-debian

     

       1774
       1774
       +
               pkgs.iproute2

     

       1775
       1775
       +
               pkgs.iputils

     

       1776
       1776
       +
             ]

     

       1777
       1777
       +
             ++ optionals config.networking.wireless.enable [

     

       1778
       1778
       +
               pkgs.wirelesstools # FIXME: obsolete?

     

       1779
       1779
       +
               pkgs.iw

     

       1780
       1780
       +
             ]

     

       1781
       1781
       +
             ++ bridgeStp

     

       1782
       1782
       +
           );

     

       1781
       1783
        
       

     

       1782
       1784
        
           # Wake-on-LAN configuration is shared by the scripted and networkd backends.

     

       1783
       1785
        
           systemd.network.links = pipe interfaces [