From 141749700175fc645e6dfc20f67352b1fc695c80 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 21 Mar 2024 05:13:48 +0000 Subject: [PATCH] users/services: remove serviceConfig.Type option --- hosts/common/programs/abaddon.nix | 5 +- hosts/common/programs/bonsai.nix | 1 - hosts/common/programs/calls.nix | 7 +-- hosts/common/programs/conky/default.nix | 1 - hosts/common/programs/dconf.nix | 5 +- hosts/common/programs/dino.nix | 21 ++++---- hosts/common/programs/dissent.nix | 5 +- hosts/common/programs/fcitx5.nix | 5 +- hosts/common/programs/feedbackd.nix | 19 +++---- hosts/common/programs/fractal.nix | 7 +-- hosts/common/programs/geary.nix | 5 +- .../common/programs/gnome-keyring/default.nix | 1 - hosts/common/programs/mako.nix | 1 - hosts/common/programs/ntfy-sh.nix | 1 - hosts/common/programs/pipewire.nix | 2 - hosts/common/programs/playerctl.nix | 2 - .../programs/sane-input-handler/default.nix | 5 +- hosts/common/programs/signal-desktop.nix | 7 +-- .../programs/sway-autoscaler/default.nix | 17 +++--- hosts/common/programs/sway/default.nix | 5 +- hosts/common/programs/swayidle.nix | 31 +++++------ .../swaynotificationcenter/default.nix | 7 +-- hosts/common/programs/sysvol.nix | 21 ++++---- hosts/common/programs/waybar/default.nix | 7 +-- hosts/common/programs/wireplumber.nix | 5 +- hosts/common/programs/wvkbd.nix | 53 +++++++++---------- .../programs/xdg-desktop-portal-gtk.nix | 3 +- .../programs/xdg-desktop-portal-wlr.nix | 3 +- hosts/common/programs/xdg-desktop-portal.nix | 2 - modules/users/default.nix | 3 -- 30 files changed, 92 insertions(+), 165 deletions(-) diff --git a/hosts/common/programs/abaddon.nix b/hosts/common/programs/abaddon.nix index 6c913cc54..edbd069fd 100644 --- a/hosts/common/programs/abaddon.nix +++ b/hosts/common/programs/abaddon.nix @@ -88,10 +88,7 @@ in services.abaddon = { description = "unofficial Discord chat client"; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/abaddon"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/abaddon"; }; }; } diff --git a/hosts/common/programs/bonsai.nix b/hosts/common/programs/bonsai.nix index d4adf5692..9fc9047d8 100644 --- a/hosts/common/programs/bonsai.nix +++ b/hosts/common/programs/bonsai.nix @@ -125,7 +125,6 @@ in ${pkgs.coreutils}/bin/rm -f $XDG_RUNTIME_DIR/bonsai exec ${cfg.package}/bin/bonsaid -t ${cfg.config.configFile} ''; - serviceConfig.Type = "simple"; }; }; } diff --git a/hosts/common/programs/calls.nix b/hosts/common/programs/calls.nix index 49e6a6ed2..903005e3e 100644 --- a/hosts/common/programs/calls.nix +++ b/hosts/common/programs/calls.nix @@ -45,11 +45,8 @@ in # TODO: prevent gnome-calls from daemonizing when started manually description = "gnome-calls daemon to monitor incoming SIP calls"; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - # add --verbose for more debugging - ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon"; - Type = "simple"; - }; + # add --verbose for more debugging + serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/gnome-calls --daemon"; }; }; programs.calls = lib.mkIf cfg.enabled { diff --git a/hosts/common/programs/conky/default.nix b/hosts/common/programs/conky/default.nix index 31187df64..516cf195e 100644 --- a/hosts/common/programs/conky/default.nix +++ b/hosts/common/programs/conky/default.nix @@ -31,7 +31,6 @@ wantedBy = [ "graphical-session.target" ]; serviceConfig.ExecStart = "${config.sane.programs.conky.package}/bin/conky"; - serviceConfig.Type = "simple"; }; }; } diff --git a/hosts/common/programs/dconf.nix b/hosts/common/programs/dconf.nix index d2f040fd3..0b1515c0c 100644 --- a/hosts/common/programs/dconf.nix +++ b/hosts/common/programs/dconf.nix @@ -37,10 +37,7 @@ in after = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${lib.getLib cfg.package}/libexec/dconf-service"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${lib.getLib cfg.package}/libexec/dconf-service"; }; # supposedly necessary for packages which haven't been wrapped (i.e. wrapGtkApp?), diff --git a/hosts/common/programs/dino.nix b/hosts/common/programs/dino.nix index a435266e3..29316a7cb 100644 --- a/hosts/common/programs/dino.nix +++ b/hosts/common/programs/dino.nix @@ -72,18 +72,15 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - # audio buffering; see: - # dino defaults to 10ms mic buffer, which causes underruns, which Dino handles *very* poorly - # as in, the other end of the call will just not receive sound from us for a couple seconds. - # pipewire uses power-of-two buffering for the mic itself. that would put us at 21.33 ms, but this env var supports only whole numbers (21ms ends up not power-of-two). - # also, Dino's likely still doing things in 10ms batches internally anyway. - # - # note that debug logging during calls produces so much journal spam that it pegs the CPU and causes dropped audio - # env G_MESSAGES_DEBUG = "all"; - ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino"; - Type = "simple"; - }; + # audio buffering; see: + # dino defaults to 10ms mic buffer, which causes underruns, which Dino handles *very* poorly + # as in, the other end of the call will just not receive sound from us for a couple seconds. + # pipewire uses power-of-two buffering for the mic itself. that would put us at 21.33 ms, but this env var supports only whole numbers (21ms ends up not power-of-two). + # also, Dino's likely still doing things in 10ms batches internally anyway. + # + # note that debug logging during calls produces so much journal spam that it pegs the CPU and causes dropped audio + # env G_MESSAGES_DEBUG = "all"; + serviceConfig.ExecStart = "env PULSE_LATENCY_MSEC=20 ${cfg.package}/bin/dino"; }; }; } diff --git a/hosts/common/programs/dissent.nix b/hosts/common/programs/dissent.nix index fe62c55c8..3ff3c48f1 100644 --- a/hosts/common/programs/dissent.nix +++ b/hosts/common/programs/dissent.nix @@ -60,10 +60,7 @@ in after = [ "graphical-session.target" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/dissent"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/dissent"; }; }; } diff --git a/hosts/common/programs/fcitx5.nix b/hosts/common/programs/fcitx5.nix index b8d131336..b8a5fa599 100644 --- a/hosts/common/programs/fcitx5.nix +++ b/hosts/common/programs/fcitx5.nix @@ -103,10 +103,7 @@ in after = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart="${cfg.package}/bin/fcitx5"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/fcitx5"; }; env.XMODIFIERS = "@im=fcitx"; diff --git a/hosts/common/programs/feedbackd.nix b/hosts/common/programs/feedbackd.nix index 8536a578b..285c24af2 100644 --- a/hosts/common/programs/feedbackd.nix +++ b/hosts/common/programs/feedbackd.nix @@ -97,17 +97,14 @@ in services.feedbackd = { description = "feedbackd audio/vibration/led controller"; wantedBy = [ "default.target" ]; #< should technically be `sound.target`, but that doesn't seem to get auto-started? - serviceConfig = { - ExecStart = lib.concatStringsSep " " ([ - "env" - "G_MESSAGES_DEBUG=all" - ] ++ lib.optionals cfg.config.proxied [ - "FEEDBACK_THEME=$HOME/.config/feedbackd/themes/proxied.json" - ] ++ [ - "${cfg.package}/libexec/feedbackd" - ]); - Type = "simple"; - }; + serviceConfig.ExecStart = lib.concatStringsSep " " ([ + "env" + "G_MESSAGES_DEBUG=all" + ] ++ lib.optionals cfg.config.proxied [ + "FEEDBACK_THEME=$HOME/.config/feedbackd/themes/proxied.json" + ] ++ [ + "${cfg.package}/libexec/feedbackd" + ]); }; }; diff --git a/hosts/common/programs/fractal.nix b/hosts/common/programs/fractal.nix index 69545d7db..456388d08 100644 --- a/hosts/common/programs/fractal.nix +++ b/hosts/common/programs/fractal.nix @@ -72,11 +72,8 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - # env "G_MESSAGES_DEBUG=all" - ExecStart = "${cfg.package}/bin/fractal"; - Type = "simple"; - }; + # env "G_MESSAGES_DEBUG=all" + serviceConfig.ExecStart = "${cfg.package}/bin/fractal"; }; }; } diff --git a/hosts/common/programs/geary.nix b/hosts/common/programs/geary.nix index 51dea2790..d8ade4d83 100644 --- a/hosts/common/programs/geary.nix +++ b/hosts/common/programs/geary.nix @@ -91,10 +91,7 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/geary"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/geary"; }; }; diff --git a/hosts/common/programs/gnome-keyring/default.nix b/hosts/common/programs/gnome-keyring/default.nix index 93485d5e0..336f0dc89 100644 --- a/hosts/common/programs/gnome-keyring/default.nix +++ b/hosts/common/programs/gnome-keyring/default.nix @@ -56,7 +56,6 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/gnome-keyring-daemon --start --foreground --components=secrets"; ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0700 -p %t/keyring"; - Type = "simple"; }; }; }; diff --git a/hosts/common/programs/mako.nix b/hosts/common/programs/mako.nix index b14ec55d9..37605b843 100644 --- a/hosts/common/programs/mako.nix +++ b/hosts/common/programs/mako.nix @@ -56,7 +56,6 @@ wantedBy = [ "graphical-session.target" ]; serviceConfig.ExecStart = "${config.sane.programs.mako.package}/bin/mako"; - serviceConfig.Type = "simple"; }; }; } diff --git a/hosts/common/programs/ntfy-sh.nix b/hosts/common/programs/ntfy-sh.nix index 928ec937d..08a9ac13b 100644 --- a/hosts/common/programs/ntfy-sh.nix +++ b/hosts/common/programs/ntfy-sh.nix @@ -32,7 +32,6 @@ in topic=$(cat ~/.config/ntfy-sh/topic) ntfy sub "https://ntfy.uninsane.org:2587/$topic" ''; - serviceConfig.Type = "simple"; }; }; } diff --git a/hosts/common/programs/pipewire.nix b/hosts/common/programs/pipewire.nix index cf29214c5..fc67ccf33 100644 --- a/hosts/common/programs/pipewire.nix +++ b/hosts/common/programs/pipewire.nix @@ -46,7 +46,6 @@ in waitFor "$XDG_RUNTIME_DIR/pipewire-0-manager" ''; ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/{pipewire-0,pipewire-0.lock,pipewire-0-manager,pipewire-0-manager.lock}"''; - Type = "simple"; }; }; services.pipewire-pulse = { @@ -65,7 +64,6 @@ in waitFor "$XDG_RUNTIME_DIR/pulse/pid" ''; ExecStopPost = ''rm -f "$XDG_RUNTIME_DIR/pulse/{native,pid}"''; - Type = "simple"; }; }; }; diff --git a/hosts/common/programs/playerctl.nix b/hosts/common/programs/playerctl.nix index 4b9663f02..a59c2c69c 100644 --- a/hosts/common/programs/playerctl.nix +++ b/hosts/common/programs/playerctl.nix @@ -10,9 +10,7 @@ documentation = [ "https://github.com/altdesktop/playerctl/issues/161" ]; wantedBy = [ "default.target" ]; #< TODO: maybe better to zero `wantedBy` here and have the specific consumers (e.g. swaync) explicitly depend on this. serviceConfig.ExecStart = "${config.sane.programs.playerctl.package}/bin/playerctld"; - # serviceConfig.Type = "dbus"; # serviceConfig.BusName = "org.mpris.MediaPlayer2.Player"; - serviceConfig.Type = "simple"; # playerctl also supports a --daemon option, idk if that's better }; }; } diff --git a/hosts/common/programs/sane-input-handler/default.nix b/hosts/common/programs/sane-input-handler/default.nix index db55b2da3..b1b9f0656 100644 --- a/hosts/common/programs/sane-input-handler/default.nix +++ b/hosts/common/programs/sane-input-handler/default.nix @@ -127,10 +127,7 @@ in # after = [ "graphical-session.target" ]; # wantedBy = [ "graphical-session.target" ]; - # serviceConfig = { - # ExecStart = "${config.sane.programs.actkbd.package}/bin/actkbd -c /home/colin/.config/actkbd/actkbd.conf"; - # Type = "simple"; - # }; + # serviceConfig.ExecStart = "${config.sane.programs.actkbd.package}/bin/actkbd -c /home/colin/.config/actkbd/actkbd.conf"; # }; # }; diff --git a/hosts/common/programs/signal-desktop.nix b/hosts/common/programs/signal-desktop.nix index 588a798f7..228b6cba8 100644 --- a/hosts/common/programs/signal-desktop.nix +++ b/hosts/common/programs/signal-desktop.nix @@ -50,11 +50,8 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - # for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service - ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop"; - Type = "simple"; - }; + # for some reason the --ozone-platform-hint=auto flag fails when signal-desktop is launched from a service + serviceConfig.ExecStart = "env NIXOS_OZONE_WL=1 ${cfg.package}/bin/signal-desktop"; }; }; } diff --git a/hosts/common/programs/sway-autoscaler/default.nix b/hosts/common/programs/sway-autoscaler/default.nix index e7b62a9e2..acc19bec6 100644 --- a/hosts/common/programs/sway-autoscaler/default.nix +++ b/hosts/common/programs/sway-autoscaler/default.nix @@ -32,16 +32,13 @@ in services.sway-autoscaler = { description = "adjust global desktop scale to match the activate application"; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = lib.escapeShellArgs [ - "env" - "SWAY_DEFAULT_SCALE=${builtins.toString cfg.config.defaultScale}" - "${cfg.package}/bin/sway-autoscaler" - "--loop-sec" - (builtins.toString cfg.config.interval) - ]; - Type = "simple"; - }; + serviceConfig.ExecStart = lib.escapeShellArgs [ + "env" + "SWAY_DEFAULT_SCALE=${builtins.toString cfg.config.defaultScale}" + "${cfg.package}/bin/sway-autoscaler" + "--loop-sec" + (builtins.toString cfg.config.interval) + ]; }; }; } diff --git a/hosts/common/programs/sway/default.nix b/hosts/common/programs/sway/default.nix index a450d0258..bb97f20db 100644 --- a/hosts/common/programs/sway/default.nix +++ b/hosts/common/programs/sway/default.nix @@ -254,10 +254,7 @@ in services.sway = { description = "sway: tiling wayland desktop environment"; wantedBy = [ "default.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/sway"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/sway"; }; }; diff --git a/hosts/common/programs/swayidle.nix b/hosts/common/programs/swayidle.nix index 6d1d56fc5..69ac3e915 100644 --- a/hosts/common/programs/swayidle.nix +++ b/hosts/common/programs/swayidle.nix @@ -57,23 +57,20 @@ in after = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = lib.escapeShellArgs ( - [ - "${cfg.package}/bin/swayidle" - "-w" - ] ++ lib.flatten ( - lib.mapAttrsToList - (_: { command, delay, enable, ... }: lib.optionals enable [ - "timeout" - (builtins.toString delay) - command - ]) - cfg.config.actions - ) - ); - Type = "simple"; - }; + serviceConfig.ExecStart = lib.escapeShellArgs ( + [ + "${cfg.package}/bin/swayidle" + "-w" + ] ++ lib.flatten ( + lib.mapAttrsToList + (_: { command, delay, enable, ... }: lib.optionals enable [ + "timeout" + (builtins.toString delay) + command + ]) + cfg.config.actions + ) + ); }; }; } diff --git a/hosts/common/programs/swaynotificationcenter/default.nix b/hosts/common/programs/swaynotificationcenter/default.nix index 34e26fd96..961f28d1f 100644 --- a/hosts/common/programs/swaynotificationcenter/default.nix +++ b/hosts/common/programs/swaynotificationcenter/default.nix @@ -478,11 +478,8 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync"; - Type = "simple"; - # BusName = "org.freedesktop.Notifications"; - }; + serviceConfig.ExecStart = "env G_MESSAGES_DEBUG=all ${cfg.package}/bin/swaync"; + # serviceConfig.BusName = "org.freedesktop.Notifications"; }; }; diff --git a/hosts/common/programs/sysvol.nix b/hosts/common/programs/sysvol.nix index c4f520c95..4e6662efd 100644 --- a/hosts/common/programs/sysvol.nix +++ b/hosts/common/programs/sysvol.nix @@ -68,18 +68,15 @@ in after = [ "graphical-session.target" "pipewire-pulse.service" ]; wantedBy = lib.mkIf cfg.config.autostart [ "graphical-session.target" ]; - serviceConfig = { - # options: - # -p {0,1,2,3} to attach to top/right/bottom/left screen edge - # -t N for the notifier to be dismissed after N seconds (integer only) - # -m N to set the indicator this many pixels in from the edge. - # it considers sway bars, but not window titles - # -{H,W} N to set the height/width of the notifier, in px. - # -i N to set the size of the volume icon - # -P to hide percentage text - ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P"; - Type = "simple"; - }; + # options: + # -p {0,1,2,3} to attach to top/right/bottom/left screen edge + # -t N for the notifier to be dismissed after N seconds (integer only) + # -m N to set the indicator this many pixels in from the edge. + # it considers sway bars, but not window titles + # -{H,W} N to set the height/width of the notifier, in px. + # -i N to set the size of the volume icon + # -P to hide percentage text + serviceConfig.ExecStart = "${cfg.package}/bin/sysvol -p 0 -t 1 -m 22 -H 39 -W 256 -i 32 -P"; }; }; } diff --git a/hosts/common/programs/waybar/default.nix b/hosts/common/programs/waybar/default.nix index 1bbda6bfc..435efee2c 100644 --- a/hosts/common/programs/waybar/default.nix +++ b/hosts/common/programs/waybar/default.nix @@ -119,11 +119,8 @@ in # partOf = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - # env G_MESSAGES_DEBUG=all - ExecStart = "${cfg.package}/bin/waybar"; - Type = "simple"; - }; + # env G_MESSAGES_DEBUG=all + serviceConfig.ExecStart = "${cfg.package}/bin/waybar"; }; }; } diff --git a/hosts/common/programs/wireplumber.nix b/hosts/common/programs/wireplumber.nix index 8144650ff..3a93d31d5 100644 --- a/hosts/common/programs/wireplumber.nix +++ b/hosts/common/programs/wireplumber.nix @@ -37,10 +37,7 @@ in after = [ "pipewire.service" ]; bindsTo = [ "pipewire.service" ]; wantedBy = [ "pipewire.service" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/wireplumber"; - Type = "simple"; - }; + serviceConfig.ExecStart = "${cfg.package}/bin/wireplumber"; }; }; } diff --git a/hosts/common/programs/wvkbd.nix b/hosts/common/programs/wvkbd.nix index b9f8f597a..ea7ed5828 100644 --- a/hosts/common/programs/wvkbd.nix +++ b/hosts/common/programs/wvkbd.nix @@ -20,35 +20,32 @@ in description = "wvkbd: wayland virtual keyboard"; after = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ]; - serviceConfig = { + serviceConfig.ExecStart = lib.escapeShellArgs [ + "env" # --hidden: send SIGUSR2 to unhide - ExecStart = lib.escapeShellArgs [ - "env" - # wvkbd layers: - # - full - # - landscape - # - special (e.g. coding symbols like ~) - # - emoji - # - nav - # - simple (like landscape, but no parens/tab/etc; even fewer chars) - # - simplegrid (simple, but grid layout) - # - dialer (digits) - # - cyrillic - # - arabic - # - persian - # - greek - # - georgian - "WVKBD_LANDSCAPE_LAYERS=landscape,special,emoji" - "WVKBD_LAYERS=full,special,emoji" - "WVKBD_HEIGHT=216" #< default: 250 (pixels) - # "WVKBD_LANDSCAPE_HEIGHT=??" #< default: 120 (pixels) - # more settings tunable inside config.h when compiling: - # - KBD_KEY_BORDER = 2 - "${cfg.package}/bin/wvkbd-mobintl" - "--hidden" - ]; - Type = "simple"; - }; + # wvkbd layers: + # - full + # - landscape + # - special (e.g. coding symbols like ~) + # - emoji + # - nav + # - simple (like landscape, but no parens/tab/etc; even fewer chars) + # - simplegrid (simple, but grid layout) + # - dialer (digits) + # - cyrillic + # - arabic + # - persian + # - greek + # - georgian + "WVKBD_LANDSCAPE_LAYERS=landscape,special,emoji" + "WVKBD_LAYERS=full,special,emoji" + "WVKBD_HEIGHT=216" #< default: 250 (pixels) + # "WVKBD_LANDSCAPE_HEIGHT=??" #< default: 120 (pixels) + # more settings tunable inside config.h when compiling: + # - KBD_KEY_BORDER = 2 + "${cfg.package}/bin/wvkbd-mobintl" + "--hidden" + ]; }; }; } diff --git a/hosts/common/programs/xdg-desktop-portal-gtk.nix b/hosts/common/programs/xdg-desktop-portal-gtk.nix index 5eeaa71e5..2556ec907 100644 --- a/hosts/common/programs/xdg-desktop-portal-gtk.nix +++ b/hosts/common/programs/xdg-desktop-portal-gtk.nix @@ -46,8 +46,7 @@ in wantedBy = [ "xdg-desktop-portal.service" ]; serviceConfig = { - ExecStart="${cfg.package}/libexec/xdg-desktop-portal-gtk"; - Type = "dbus"; + ExecStart = "${cfg.package}/libexec/xdg-desktop-portal-gtk"; BusName = "org.freedesktop.impl.portal.desktop.gtk"; }; }; diff --git a/hosts/common/programs/xdg-desktop-portal-wlr.nix b/hosts/common/programs/xdg-desktop-portal-wlr.nix index 69ec78dcc..b20fbe6a0 100644 --- a/hosts/common/programs/xdg-desktop-portal-wlr.nix +++ b/hosts/common/programs/xdg-desktop-portal-wlr.nix @@ -31,8 +31,7 @@ in wantedBy = [ "xdg-desktop-portal.service" ]; serviceConfig = { - ExecStart="${cfg.package}/libexec/xdg-desktop-portal-wlr"; - Type = "dbus"; + ExecStart = "${cfg.package}/libexec/xdg-desktop-portal-wlr"; BusName = "org.freedesktop.impl.portal.desktop.wlr"; }; }; diff --git a/hosts/common/programs/xdg-desktop-portal.nix b/hosts/common/programs/xdg-desktop-portal.nix index 525521202..d1799f016 100644 --- a/hosts/common/programs/xdg-desktop-portal.nix +++ b/hosts/common/programs/xdg-desktop-portal.nix @@ -70,7 +70,6 @@ in # "G_MESSAGES_DEBUG=all" #< also applies to all apps launched by the portal "${cfg.package}/libexec/xdg-desktop-portal" ]; - Type = "dbus"; BusName = "org.freedesktop.portal.Desktop"; }; }; @@ -89,7 +88,6 @@ in "XDG_DESKTOP_PORTAL_DIR=$HOME/.config/xdg-desktop-portal" "${cfg.package}/libexec/xdg-permission-store" ]; - Type = "dbus"; BusName = "org.freedesktop.impl.portal.PermissionStore"; }; }; diff --git a/modules/users/default.nix b/modules/users/default.nix index 46a9d6bf9..fa8b20784 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -42,9 +42,6 @@ let default = null; }; - serviceConfig.Type = mkOption { - type = types.enum [ "dbus" "simple" ]; - }; serviceConfig.ExecStart = mkOption { type = types.nullOr (types.coercedTo types.package toString types.str); default = null;