diff options
Diffstat (limited to 'modules/services')
28 files changed, 33 insertions, 33 deletions
diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix index 92d0cdd26f3..ead53c3dc3a 100644 --- a/modules/services/audio/alsa.nix +++ b/modules/services/audio/alsa.nix @@ -50,7 +50,7 @@ in boot.kernelModules = optional config.sound.enableOSSEmulation "snd_pcm_oss"; - boot.systemd.services."alsa-store" = + systemd.services."alsa-store" = { description = "Store Sound Card State"; wantedBy = [ "shutdown.target" ]; before = [ "shutdown.target" ]; diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix index 9e9e1c7dd8c..887f1f0529f 100644 --- a/modules/services/databases/mongodb.nix +++ b/modules/services/databases/mongodb.nix @@ -102,7 +102,7 @@ in environment.systemPackages = [ mongodb ]; - boot.systemd.services.mongodb = + systemd.services.mongodb = { description = "MongoDB server"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix index ef29d563c72..7bf7a77aa85 100644 --- a/modules/services/databases/mysql.nix +++ b/modules/services/databases/mysql.nix @@ -141,7 +141,7 @@ in environment.systemPackages = [mysql]; - boot.systemd.services.mysql = + systemd.services.mysql = { description = "MySQL Server"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/databases/mysql55.nix b/modules/services/databases/mysql55.nix index 51fe37b7684..37cab395677 100644 --- a/modules/services/databases/mysql55.nix +++ b/modules/services/databases/mysql55.nix @@ -134,7 +134,7 @@ in environment.systemPackages = [mysql]; - boot.systemd.services.mysql = + systemd.services.mysql = { description = "MySQL Server"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix index c178a84b1b8..a33fdaab423 100644 --- a/modules/services/databases/postgresql.nix +++ b/modules/services/databases/postgresql.nix @@ -155,7 +155,7 @@ in environment.systemPackages = [postgresql]; - boot.systemd.services.postgresql = + systemd.services.postgresql = { description = "PostgreSQL Server"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix index 58f2610ce06..54f5d03de39 100644 --- a/modules/services/hardware/upower.nix +++ b/modules/services/hardware/upower.nix @@ -35,7 +35,7 @@ with pkgs.lib; services.udev.packages = [ pkgs.upower ]; - boot.systemd.services.upower = + systemd.services.upower = { description = "Power Management Daemon"; path = [ pkgs.glib ]; # needed for gdbus serviceConfig = diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix index bc44620d644..b535a942a9e 100644 --- a/modules/services/logging/logstash.nix +++ b/modules/services/logging/logstash.nix @@ -136,7 +136,7 @@ in mkNameValuePairs = mergeConfigs; }; } ( mkIf cfg.enable { - boot.systemd.services.logstash = with pkgs; { + systemd.services.logstash = with pkgs; { description = "Logstash daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix index 8c815ddf25f..886669606b4 100644 --- a/modules/services/logging/syslogd.nix +++ b/modules/services/logging/syslogd.nix @@ -105,7 +105,7 @@ in services.syslogd.extraParams = optional cfg.enableNetworkInput "-r"; # FIXME: restarting syslog seems to break journal logging. - boot.systemd.services.syslog = + systemd.services.syslog = { description = "Syslog Daemon"; requires = [ "syslog.socket" ]; diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index eaea8bd653a..a2ec899a593 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -270,14 +270,14 @@ in target = "nix.machines"; }; - boot.systemd.sockets."nix-daemon" = + systemd.sockets."nix-daemon" = { description = "Nix Daemon Socket"; wantedBy = [ "sockets.target" ]; before = [ "multi-user.target" ]; socketConfig.ListenStream = "/nix/var/nix/daemon-socket/socket"; }; - boot.systemd.services."nix-daemon" = + systemd.services."nix-daemon" = { description = "Nix Daemon"; path = [ nix pkgs.openssl pkgs.utillinux ] diff --git a/modules/services/misc/nix-gc.nix b/modules/services/misc/nix-gc.nix index 435326e87fb..dc9fa85cf66 100644 --- a/modules/services/misc/nix-gc.nix +++ b/modules/services/misc/nix-gc.nix @@ -51,7 +51,7 @@ in services.cron.systemCronJobs = mkIf cfg.automatic (singleton "${cfg.dates} root ${config.system.build.systemd}/bin/systemctl start nix-gc.service"); - boot.systemd.services."nix-gc" = + systemd.services."nix-gc" = { description = "Nix Garbage Collector"; path = [ config.environment.nix ]; script = "exec nix-collect-garbage ${cfg.options}"; diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix index 1a172904c45..108ed2911ce 100644 --- a/modules/services/misc/nixos-manual.nix +++ b/modules/services/misc/nixos-manual.nix @@ -84,7 +84,7 @@ in boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; - boot.systemd.services = optionalAttrs cfg.showManual + systemd.services = optionalAttrs cfg.showManual { "nixos-manual" = { description = "NixOS Manual"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix index 12d61a8ea9f..c5cc8b4050d 100644 --- a/modules/services/misc/rogue.nix +++ b/modules/services/misc/rogue.nix @@ -40,7 +40,7 @@ in boot.extraTTYs = [ cfg.tty ]; - boot.systemd.services.rogue = + systemd.services.rogue = { description = "Rogue dungeon crawling game"; wantedBy = [ "multi-user.target" ]; serviceConfig = diff --git a/modules/services/monitoring/dd-agent.nix b/modules/services/monitoring/dd-agent.nix index c0493557d56..c6ab1ca0a3a 100644 --- a/modules/services/monitoring/dd-agent.nix +++ b/modules/services/monitoring/dd-agent.nix @@ -43,7 +43,7 @@ in { config = mkIf cfg.enable { environment.etc = [ { source = datadog-conf; target = "dd-agent/datadog.conf"; } ]; - boot.systemd.services.dd-agent = { + systemd.services.dd-agent = { description = "Datadog agent monitor"; path = [ pkgs.sysstat pkgs.procps ]; diff --git a/modules/services/monitoring/smartd.nix b/modules/services/monitoring/smartd.nix index 48066856625..07acab761d0 100644 --- a/modules/services/monitoring/smartd.nix +++ b/modules/services/monitoring/smartd.nix @@ -81,7 +81,7 @@ in config = mkIf cfg.enable { - boot.systemd.services.smartd = { + systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; environment.TZ = config.time.timeZone; diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix index 9758bc8cb48..229236c1bbd 100644 --- a/modules/services/monitoring/zabbix-agent.nix +++ b/modules/services/monitoring/zabbix-agent.nix @@ -73,7 +73,7 @@ in description = "Zabbix daemon user"; }; - boot.systemd.services."zabbix-agent" = + systemd.services."zabbix-agent" = { description = "Zabbix Agent"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix index 085fb022c1c..df42071ebba 100644 --- a/modules/services/monitoring/zabbix-server.nix +++ b/modules/services/monitoring/zabbix-server.nix @@ -73,7 +73,7 @@ in description = "Zabbix daemon user"; }; - boot.systemd.services."zabbix-server" = + systemd.services."zabbix-server" = { description = "Zabbix Server"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/network-filesystems/nfsd.nix b/modules/services/network-filesystems/nfsd.nix index 995e9bba603..ab8e77e2bad 100644 --- a/modules/services/network-filesystems/nfsd.nix +++ b/modules/services/network-filesystems/nfsd.nix @@ -80,7 +80,7 @@ in boot.kernelModules = [ "nfsd" ]; - boot.systemd.services.nfsd = + systemd.services.nfsd = { description = "NFS Server"; wantedBy = [ "multi-user.target" ]; @@ -108,7 +108,7 @@ in serviceConfig.RemainAfterExit = true; }; - boot.systemd.services.mountd = + systemd.services.mountd = { description = "NFSv3 Mount Daemon"; requires = [ "rpcbind.service" ]; diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix index aa75c4322a0..c4157c647c6 100644 --- a/modules/services/network-filesystems/samba.nix +++ b/modules/services/network-filesystems/samba.nix @@ -200,7 +200,7 @@ in }; - boot.systemd = { + systemd = { targets.samba = { description = "Samba server"; requires = [ "samba-setup.service" ]; diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix index 739ba95d5e3..533b719a667 100644 --- a/modules/services/networking/dhcpcd.nix +++ b/modules/services/networking/dhcpcd.nix @@ -92,7 +92,7 @@ in config = mkIf config.networking.useDHCP { - boot.systemd.services.dhcpcd = + systemd.services.dhcpcd = { description = "DHCP Client"; wantedBy = [ "network.target" ]; diff --git a/modules/services/networking/gogoclient.nix b/modules/services/networking/gogoclient.nix index 7d742df97b0..07c35e3cb3d 100644 --- a/modules/services/networking/gogoclient.nix +++ b/modules/services/networking/gogoclient.nix @@ -58,7 +58,7 @@ in networking.enableIPv6 = true; - boot.systemd.services.gogoclient = { + systemd.services.gogoclient = { description = "ipv6 tunnel"; after = [ "network.target" ]; diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix index 12808e2ee27..4ea6fa135b0 100644 --- a/modules/services/networking/openvpn.nix +++ b/modules/services/networking/openvpn.nix @@ -11,7 +11,7 @@ let makeOpenVPNJob = cfg: name: let - path = (getAttr "openvpn-${name}" config.boot.systemd.services).path; + path = (getAttr "openvpn-${name}" config.systemd.services).path; upScript = '' #! /bin/sh diff --git a/modules/services/networking/rpcbind.nix b/modules/services/networking/rpcbind.nix index f82803e7519..7180b2cfa14 100644 --- a/modules/services/networking/rpcbind.nix +++ b/modules/services/networking/rpcbind.nix @@ -65,7 +65,7 @@ in environment.etc = [ netconfigFile ]; - boot.systemd.services.rpcbind = + systemd.services.rpcbind = { description = "ONC RPC Directory Service"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/networking/ssh/sshd.nix b/modules/services/networking/ssh/sshd.nix index 8f898ce06a1..e9df8dd3cf6 100644 --- a/modules/services/networking/ssh/sshd.nix +++ b/modules/services/networking/ssh/sshd.nix @@ -262,7 +262,7 @@ in } ]; - boot.systemd.services.sshd = + systemd.services.sshd = { description = "SSH Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix index a6544368ea0..4a9d9a77b57 100644 --- a/modules/services/system/dbus.nix +++ b/modules/services/system/dbus.nix @@ -118,7 +118,7 @@ in # FIXME: these are copied verbatim from the dbus source tree. We # should install and use the originals. - boot.systemd.units."dbus.socket".text = + systemd.units."dbus.socket".text = '' [Unit] Description=D-Bus System Message Bus Socket @@ -127,7 +127,7 @@ in ListenStream=/var/run/dbus/system_bus_socket ''; - boot.systemd.units."dbus.service".text = + systemd.units."dbus.service".text = '' [Unit] Description=D-Bus System Message Bus diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix index 1843368ba27..22f507f39d7 100644 --- a/modules/services/system/nscd.nix +++ b/modules/services/system/nscd.nix @@ -38,7 +38,7 @@ in description = "Name service cache daemon user"; }; - boot.systemd.services.nscd = + systemd.services.nscd = { description = "Name Service Cache Daemon"; wantedBy = [ "nss-lookup.target" "nss-user-lookup.target" ]; diff --git a/modules/services/ttys/agetty.nix b/modules/services/ttys/agetty.nix index 444d04564a9..f269de6fc2a 100644 --- a/modules/services/ttys/agetty.nix +++ b/modules/services/ttys/agetty.nix @@ -39,7 +39,7 @@ with pkgs.lib; # which some small modifications, which is annoying. # Generate a separate job for each tty. - boot.systemd.units."getty@.service".text = + systemd.units."getty@.service".text = '' [Unit] Description=Getty on %I @@ -76,7 +76,7 @@ with pkgs.lib; X-RestartIfChanged=false ''; - boot.systemd.units."serial-getty@.service".text = + systemd.units."serial-getty@.service".text = '' [Unit] Description=Serial Getty on %I diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix index 17a8c8216ca..35afacefa16 100644 --- a/modules/services/web-servers/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -601,7 +601,7 @@ in date.timezone = "${config.time.timeZone}" ''; - boot.systemd.services.httpd = + systemd.services.httpd = { description = "Apache HTTPD"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 599f8be226d..2e6158bafa1 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -386,9 +386,9 @@ in environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; - boot.systemd.defaultUnit = mkIf cfg.autorun "graphical.target"; + systemd.defaultUnit = mkIf cfg.autorun "graphical.target"; - boot.systemd.services."display-manager" = + systemd.services."display-manager" = { description = "X11 Server"; after = [ "systemd-udev-settle.service" "local-fs.target" ]; |