diff options
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 25 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 1 | ||||
-rw-r--r-- | nixos/modules/misc/ids.nix | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/profiles/installation-device.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/editors/emacs.nix | 86 | ||||
-rw-r--r-- | nixos/modules/services/hardware/tlp.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/search/elasticsearch.nix | 13 | ||||
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 15 | ||||
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 2 | ||||
-rw-r--r-- | nixos/tests/emacs-daemon.nix | 45 |
13 files changed, 186 insertions, 14 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 2f118d27b1a5..073f7ca34620 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -22,7 +22,7 @@ (with empty password).</para></listitem> <listitem><para>If you downloaded the graphical ISO image, you can - run <command>start display-manager</command> to start KDE. If you + run <command>systemctl start display-manager</command> to start KDE. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!)</para></listitem> diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 957a8ff9ce6d..80fb47072286 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -19,18 +19,37 @@ in "it cannot be cross compiled"; }; + # Needed by RPi firmware + nixpkgs.config.allowUnfree = true; + boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; + boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; sdImage = { - populateBootCommands = '' + populateBootCommands = let + configTxt = pkgs.writeText "config.txt" '' + [pi2] + kernel=u-boot-rpi2.bin + + [pi3] + kernel=u-boot-rpi3.bin + enable_uart=1 + ''; + in '' + for f in bootcode.bin fixup.dat start.elf; do + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ + done + cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin + cp ${pkgs.ubootRaspberryPi3}/u-boot.bin boot/u-boot-rpi3.bin + cp ${configTxt} boot/config.txt ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot - ''; + ''; }; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index e7163f10a3c3..dc196468139a 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -26,6 +26,7 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_rpi; + boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8da421447624..581cd4fb631f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -370,7 +370,7 @@ quassel = 89; amule = 90; minidlna = 91; - #elasticsearch = 92; # unused + elasticsearch = 92; #tcpcryptd = 93; # unused connman = 94; firebird = 95; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e11b7ff91bf7..67178e765c8a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -165,6 +165,7 @@ ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix ./services/development/hoogle.nix + ./services/editors/emacs.nix ./services/games/factorio.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 669b6975c690..93736ba256b3 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -42,7 +42,7 @@ with lib; The "root" account has an empty password. ${ optionalString config.services.xserver.enable - "Type `start display-manager' to\nstart the graphical user interface."} + "Type `systemctl start display-manager' to\nstart the graphical user interface."} ''; # Allow sshd to be started manually through "start sshd". diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix new file mode 100644 index 000000000000..43b4219c51dd --- /dev/null +++ b/nixos/modules/services/editors/emacs.nix @@ -0,0 +1,86 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.emacs; + + editorScript = pkgs.writeScriptBin "emacseditor" '' + #!${pkgs.stdenv.shell} + if [ -z "$1" ]; then + exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs + else + exec ${cfg.package}/bin/emacsclient --alternate-editor ${cfg.package}/bin/emacs "$@" + fi + ''; + +in { + + options.services.emacs = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable a user service for the Emacs daemon. Use <literal>emacsclient</literal> to connect to the + daemon. If <literal>true</literal>, <varname>services.emacs.install</varname> is + considered <literal>true</literal>, whatever its value. + ''; + }; + + install = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to install a user service for the Emacs daemon. Once + the service is started, use emacsclient to connect to the + daemon. + + The service must be manually started for each user with + "systemctl --user start emacs" or globally through + <varname>services.emacs.enable</varname>. + ''; + }; + + + package = mkOption { + type = types.package; + default = pkgs.emacs; + defaultText = "pkgs.emacs"; + description = '' + emacs derivation to use. + ''; + }; + + defaultEditor = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + When enabled, configures emacsclient to be the default editor + using the EDITOR environment variable. + ''; + }; + }; + + config = mkIf (cfg.enable || cfg.install) { + systemd.user.services.emacs = { + description = "Emacs: the extensible, self-documenting text editor"; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.bash}/bin/bash -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --daemon'"; + ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; + Restart = "always"; + }; + } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; + + environment.systemPackages = [ cfg.package editorScript ]; + + environment.variables = if cfg.defaultEditor then { + EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor"; + } else {}; + }; +} diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 6427c5be6818..5ab7daafa85b 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -54,6 +54,9 @@ in config = mkIf cfg.enable { + powerManagement.scsiLinkPolicy = null; + powerManagement.cpuFreqGovernor = null; + systemd.services = { tlp = { description = "TLP system startup/shutdown"; @@ -61,6 +64,7 @@ in after = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ]; before = [ "shutdown.target" ]; + restartTriggers = [ confFile ]; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 17ac8fe7e245..9299aaac2f70 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -157,11 +157,14 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { - name = "elasticsearch"; - uid = config.ids.uids.elasticsearch; - description = "Elasticsearch daemon user"; - home = cfg.dataDir; + users = { + groups.elasticsearch.gid = config.ids.gids.elasticsearch; + users.elasticsearch = { + uid = config.ids.uids.elasticsearch; + description = "Elasticsearch daemon user"; + home = cfg.dataDir; + group = "elasticsearch"; + }; }; }; } diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 9844e3c435d1..397857ea0858 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -12,7 +12,9 @@ let httpdConf = mainCfg.configFile; - php = pkgs.php.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; + php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; + + phpMajorVersion = head (splitString "." php.version); getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; @@ -338,7 +340,7 @@ let concatMap (svc: svc.extraModulesPre) allSubservices ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } - ++ optional enablePHP { name = "php5"; path = "${php}/modules/libphp5.so"; } + ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; in concatMapStrings load allModules @@ -554,6 +556,15 @@ in description = "Whether to enable the PHP module."; }; + phpPackage = mkOption { + type = types.package; + default = pkgs.php; + defaultText = "pkgs.php"; + description = '' + Overridable attribute of the PHP package to use. + ''; + }; + phpOptions = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3d8f29c80f95..b7c09d2e4bfa 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -794,6 +794,8 @@ in systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-update-utmp.restartIfChanged = false; systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. + systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; + systemd.services.systemd-logind.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 9206f0daa75d..ea503a9526f8 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -135,7 +135,7 @@ in { ''; # */ serviceConfig = { - ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon ${concatStringsSep " " cfg.extraOptions}''; + ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone Restart = "on-failure"; diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix new file mode 100644 index 000000000000..a4d63bdb7e41 --- /dev/null +++ b/nixos/tests/emacs-daemon.nix @@ -0,0 +1,45 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "emacs-daemon"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ DamienCassou ]; + }; + + enableOCR = true; + + machine = + { config, pkgs, ... }: + + { imports = [ ./common/x11.nix ]; + services.emacs = { + enable = true; + defaultEditor = true; + }; + + # Important to get the systemd service running for root + environment.variables.XDG_RUNTIME_DIR = "/run/user/0"; + + environment.variables.TEST_SYSTEM_VARIABLE = "system variable"; + }; + + testScript = + '' + $machine->waitForUnit("multi-user.target"); + + # checks that the EDITOR environment variable is set + $machine->succeed("test \$(basename \"\$EDITOR\") = emacseditor"); + + # waits for the emacs service to be ready + $machine->waitUntilSucceeds("systemctl --user status emacs.service | grep 'Active: active'"); + + # connects to the daemon + $machine->succeed("emacsclient --create-frame \$EDITOR &"); + + # checks that Emacs shows the edited filename + $machine->waitForText("emacseditor"); + + # makes sure environment variables are accessible from Emacs + $machine->succeed("emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")'") =~ /system variable/ or die; + + $machine->screenshot("emacsclient"); + ''; +}) |