standardize systemd services more

hosts/gerg-desktop/services/miniflux.nix

@@ -18,9 +18,9 @@
         "postgresql.service"
         "miniflux-dbsetup.service"
       ];
-      script = lib.getExe' pkgs.miniflux "miniflux";
 
       serviceConfig = {
+        ExecStart = lib.getExe pkgs.miniflux;
         User = "miniflux";
         RuntimeDirectory = "miniflux";
         RuntimeDirectoryMode = "0770";
@@ -72,10 +72,8 @@
         "network.target"
         "postgresql.service"
       ];
-      script = ''
-        ${lib.getExe' config.services.postgresql.package "psql"} "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore"
-      '';
       serviceConfig = {
+        ExecStart = "${lib.getExe' config.services.postgresql.package "psql"} 'miniflux' -c 'CREATE EXTENSION IF NOT EXISTS hstore'";
         Type = "oneshot";
         User = config.services.postgresql.superUser;
       };

modules/boot.nix

@@ -1,8 +1,8 @@
 {
   self',
   lib,
-  pkgs,
   config,
+  pkgs,
 }:
 {
   options.local.bootConfig.disable = lib.mkEnableOption "";
@@ -56,15 +56,12 @@
       reloadIfChanged = false;
       restartIfChanged = false;
       stopIfChanged = false;
+      wantedBy = [ "default.target" ];
       serviceConfig = {
+        ExecStart = "${lib.getExe' pkgs.efibootmgr "efibootmgr"} -t 0";
         Type = "oneshot";
         RemainAfterExit = true;
       };
-      path = [ pkgs.efibootmgr ];
-      wantedBy = [ "default.target" ];
-      script = ''
-        efibootmgr -t 0
-      '';
     };
   };
 }

modules/theming.nix

@@ -55,7 +55,7 @@ in
         platformTheme = "gtk2";
       };
       services.xserver.displayManager.sessionCommands = ''
-        ${lib.getExe' pkgs.xorg.xrdb "xrdb"} -load /etc/xdg/Xresources
+        ${lib.getExe pkgs.xorg.xrdb} -load /etc/xdg/Xresources
       '';
       fonts = {
         packages = [