Merge branch 'LnL7:master' into fast-syntax-highlighting-support

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
  push:
 
 env:
- CURRENT_STABLE_CHANNEL: nixpkgs-23.05-darwin
+ CURRENT_STABLE_CHANNEL: nixpkgs-23.11-darwin
 
 jobs:
  test-stable:

.github/workflows/update-manual.yml

@@ -21,7 +21,7 @@ jobs:
 
  - name: Build manual
  run: |
- nix-build ./release.nix -I nixpkgs=channel:nixpkgs-23.05-darwin -I darwin=. -A manualHTML
+ nix-build ./release.nix -I nixpkgs=channel:nixpkgs-23.11-darwin -I darwin=. -A manualHTML
 
  - name: Push update to manual
  run: |

README.md

@@ -103,7 +103,7 @@ Add the following to `flake.nix` in the same folder as `configuration.nix`:
  description = "John's darwin system";
 
  inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin";
  nix-darwin.url = "github:LnL7/nix-darwin";
  nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
  };

modules/documentation/default.nix

@@ -88,7 +88,7 @@ in
  documentation.enable = mkOption {
  type = types.bool;
  default = true;
- description = lib.mdDoc ''
+ description = ''
  Whether to install documentation of packages from
  {option}`environment.systemPackages` into the generated system path.
 
@@ -100,7 +100,7 @@ in
  documentation.man.enable = mkOption {
  type = types.bool;
  default = true;
- description = lib.mdDoc ''
+ description = ''
  Whether to install manual pages and the {command}`man` command.
  This also includes "man" outputs.
  '';
@@ -109,7 +109,7 @@ in
  documentation.info.enable = mkOption {
  type = types.bool;
  default = true;
- description = lib.mdDoc ''
+ description = ''
  Whether to install info pages and the {command}`info` command.
  This also includes "info" outputs.
  '';
@@ -118,7 +118,7 @@ in
  documentation.doc.enable = mkOption {
  type = types.bool;
  default = true;
- description = lib.mdDoc ''
+ description = ''
  Whether to install documentation distributed in packages' `/share/doc`.
  Usually plain text and/or HTML.
  This also includes "doc" outputs.

modules/environment/default.nix

@@ -21,7 +21,7 @@ in
  type = types.listOf types.package;
  default = [];
  example = literalExpression "[ pkgs.curl pkgs.vim ]";
- description = lib.mdDoc ''
+ description = ''
  The set of packages that appear in
  /run/current-system/sw. These packages are
  automatically available to all users, and are
@@ -34,39 +34,39 @@ in
 
  environment.systemPath = mkOption {
  type = types.listOf (types.either types.path types.str);
- description = lib.mdDoc "The set of paths that are added to PATH.";
+ description = "The set of paths that are added to PATH.";
  apply = x: if isList x then makeDrvBinPath x else x;
  };
 
  environment.profiles = mkOption {
  type = types.listOf types.str;
- description = lib.mdDoc "A list of profiles used to setup the global environment.";
+ description = "A list of profiles used to setup the global environment.";
  };
 
  environment.postBuild = mkOption {
  type = types.lines;
  default = "";
- description = lib.mdDoc "Commands to execute when building the global environment.";
+ description = "Commands to execute when building the global environment.";
  };
 
  environment.extraOutputsToInstall = mkOption {
  type = types.listOf types.str;
  default = [];
  example = [ "doc" "info" "devdoc" ];
- description = lib.mdDoc "List of additional package outputs to be symlinked into {file}`/run/current-system/sw`.";
+ description = "List of additional package outputs to be symlinked into {file}`/run/current-system/sw`.";
  };
 
  environment.pathsToLink = mkOption {
  type = types.listOf types.str;
  default = [];
  example = [ "/share/doc" ];
- description = lib.mdDoc "List of directories to be symlinked in {file}`/run/current-system/sw`.";
+ description = "List of directories to be symlinked in {file}`/run/current-system/sw`.";
  };
 
  environment.darwinConfig = mkOption {
  type = types.either types.path types.str;
  default = "$HOME/.nixpkgs/darwin-configuration.nix";
- description = lib.mdDoc ''
+ description = ''
  The path of the darwin configuration.nix used to configure the system,
  this updates the default darwin-config entry in NIX_PATH. Since this
  changes an environment variable it will only apply to new shells.
@@ -79,14 +79,14 @@ in
  environment.loginShell = mkOption {
  type = types.str;
  default = "$SHELL -l";
- description = lib.mdDoc "Configure default login shell.";
+ description = "Configure default login shell.";
  };
 
  environment.variables = mkOption {
  type = types.attrsOf (types.either types.str (types.listOf types.str));
  default = {};
  example = { EDITOR = "vim"; LANG = "nl_NL.UTF-8"; };
- description = lib.mdDoc ''
+ description = ''
  A set of environment variables used in the global environment.
  These variables will be set on shell initialisation.
  The value of each variable can be either a string or a list of
@@ -100,7 +100,7 @@ in
  type = types.attrsOf types.str;
  default = {};
  example = { ll = "ls -l"; };
- description = lib.mdDoc ''
+ description = ''
  An attribute set that maps aliases (the top level attribute names in
  this option) to command strings or directly to build outputs. The
  alises are added to all users' shells.
@@ -110,7 +110,7 @@ in
  environment.extraInit = mkOption {
  type = types.lines;
  default = "";
- description = lib.mdDoc ''
+ description = ''
  Shell script code called during global environment initialisation
  after all variables and profileVariables have been set.
  This code is asumed to be shell-independent, which means you should
@@ -120,7 +120,7 @@ in
 
  environment.shellInit = mkOption {
  default = "";
- description = lib.mdDoc ''
+ description = ''
  Shell script code called during shell initialisation.
  This code is asumed to be shell-independent, which means you should
  stick to pure sh without sh word split.
@@ -130,7 +130,7 @@ in
 
  environment.loginShellInit = mkOption {
  default = "";
- description = lib.mdDoc ''
+ description = ''
  Shell script code called during login shell initialisation.
  This code is asumed to be shell-independent, which means you should
  stick to pure sh without sh word split.
@@ -140,7 +140,7 @@ in
 
  environment.interactiveShellInit = mkOption {
  default = "";
- description = lib.mdDoc ''
+ description = ''
  Shell script code called during interactive shell initialisation.
  This code is asumed to be shell-independent, which means you should
  stick to pure sh without sh word split.
@@ -151,7 +151,10 @@ in
 
  config = {
 
- environment.systemPath = [ (makeBinPath cfg.profiles) "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" ];
+ environment.systemPath = mkMerge [
+ [ (makeBinPath cfg.profiles) ]
+ (mkOrder 1200 [ "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" ])
+ ];
 
  # Use user, default and system profiles.
  environment.profiles = mkMerge [

modules/fonts/default.nix

@@ -15,7 +15,7 @@ in
  fonts.fontDir.enable = mkOption {
  type = types.bool;
  default = false;
- description = lib.mdDoc ''
+ description = ''
  Whether to enable font management and install configured fonts to
  {file}`/Library/Fonts`.
 
@@ -27,7 +27,7 @@ in
  type = types.listOf types.path;
  default = [ ];
  example = literalExpression "[ pkgs.dejavu_fonts ]";
- description = lib.mdDoc ''
+ description = ''
  List of fonts to install.
 
  Fonts present in later entries override those with the same filenames