diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/programs/bash/bash.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/mosh.nix | 26 | ||||
| -rw-r--r-- | nixos/modules/security/acme.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/torrent/transmission.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 24 | ||||
| -rw-r--r-- | nixos/release-combined.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/printing.nix | 12 |
11 files changed, 60 insertions, 25 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index 5d69b79e13a6..5f3e2ae081cc 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -39,5 +39,5 @@ in vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; # The following are used by nixos-rebuild. - nixFallback = pkgs.nixUnstable; + nixFallback = pkgs.nixUnstable.out; } diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 642aedc3f242..1654d31cfeb4 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -98,9 +98,9 @@ in { package = mkOption { type = types.package; - default = pulseaudioLight; - defaultText = "pkgs.pulseaudioLight"; - example = literalExample "pkgs.pulseaudioFull"; + default = pulseaudioLight.out; + defaultText = "pkgs.pulseaudioLight.out"; + example = literalExample "pkgs.pulseaudioFull.out"; description = '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41b60773a70b..bb8fa48105ac 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -71,6 +71,7 @@ ./programs/kbdlight.nix ./programs/light.nix ./programs/man.nix + ./programs/mosh.nix ./programs/nano.nix ./programs/screen.nix ./programs/shadow.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 1c3c07a1c210..e4e264ec0036 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -56,7 +56,7 @@ in */ shellAliases = mkOption { - default = config.environment.shellAliases // { which = "type -P"; }; + default = config.environment.shellAliases; description = '' Set of aliases for bash shell. See <option>environment.shellAliases</option> for an option format description. diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix new file mode 100644 index 000000000000..b478f8e180fa --- /dev/null +++ b/nixos/modules/programs/mosh.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.mosh; + +in +{ + options.programs.mosh = { + enable = mkOption { + description = '' + Whether to enable mosh. Note, this will open ports in your firewall! + ''; + default = false; + example = true; + type = lib.types.bool; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ mosh ]; + networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ]; + }; +} diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index c5cd0fb60ee9..cb5410a5f15d 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -152,7 +152,7 @@ in in nameValuePair ("acme-${cert}") ({ - description = "ACME cert renewal for ${cert} using simp_le"; + description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" ]; serviceConfig = { Type = "oneshot"; @@ -192,7 +192,7 @@ in systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair ("acme-${cert}") ({ - description = "timer for ACME cert renewal of ${cert}"; + description = "Renew ACME Certificate for ${cert}"; wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = cfg.renewInterval; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 911f79e5756a..10ac6f93cfdb 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -65,8 +65,8 @@ in package = mkOption { type = types.package; - default = pkgs.nix; - defaultText = "pkgs.nix"; + default = pkgs.nix.out; + defaultText = "pkgs.nix.out"; description = '' This option specifies the Nix package instance to use throughout the system. ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index c2220cb0cff7..26182dc93cd4 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -124,7 +124,7 @@ in ${pkgs.xz.out}/lib/liblzma*.so* mr, ${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr, ${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr, - ${pkgs.libnghttp2.out}/lib/libnghttp2*.so* mr, + ${pkgs.nghttp2.lib}/lib/libnghttp2*.so* mr, ${pkgs.c-ares.out}/lib/libcares*.so* mr, ${pkgs.libcap.out}/lib/libcap*.so* mr, ${pkgs.attr.out}/lib/libattr*.so* mr, diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4f74d5732af5..70dc1ac2a26a 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -62,17 +62,25 @@ in ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} - exec startkde + exec "${kde5.startkde}" + ''; }; - security.setuidOwners = singleton { - program = "kcheckpass"; - source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; - owner = "root"; - group = "root"; - setuid = true; - }; + security.setuidOwners = [ + { + program = "kcheckpass"; + source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass"; + owner = "root"; + setuid = true; + } + { + program = "start_kdeinit_wrapper"; + source = "${kde5.plasma-workspace}/lib/libexec/kf5/start_kdeinit_wrapper"; + owner = "root"; + setuid = true; + } + ]; environment.systemPackages = [ diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 731dd36cdfd3..53ef4564b5cd 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -48,7 +48,7 @@ in rec { nixos.ova.x86_64-linux #(all nixos.tests.containers) - #(all nixos.tests.chromium.stable) + (all nixos.tests.chromium.stable) (all nixos.tests.firefox) (all nixos.tests.firewall) nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index adbef228c2f5..10d69b446cd7 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -40,9 +40,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; - $client->succeed("curl http://localhost:631/"); - $client->succeed("curl http://server:631/"); - $server->fail("curl --connect-timeout 2 http://client:631/"); + $client->succeed("curl --fail http://localhost:631/"); + $client->succeed("curl --fail http://server:631/"); + $server->fail("curl --fail --connect-timeout 2 http://client:631/"); # Add a HP Deskjet printer connected via USB to the server. $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar"); @@ -60,10 +60,10 @@ import ./make-test.nix ({pkgs, ... }: { $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die; # Test printing various file types. - foreach my $file ("${pkgs.groff.doc}/share/doc/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/meref.ps", + foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", "${pkgs.cups}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre.txt") + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") { $file =~ /([^\/]*)$/; my $fn = $1; |