From c4f378b102b725e52d1e1b62931a2a9145561871 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 22 Jun 2024 20:27:00 -0400
Subject: [PATCH] standardize systemd services more

---
 hosts/gerg-desktop/services/miniflux.nix | 6 ++----
 modules/boot.nix                         | 9 +++------
 modules/theming.nix                      | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/hosts/gerg-desktop/services/miniflux.nix b/hosts/gerg-desktop/services/miniflux.nix
index 495c460..f934eaf 100644
--- a/hosts/gerg-desktop/services/miniflux.nix
+++ b/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;
       };
diff --git a/modules/boot.nix b/modules/boot.nix
index 4233863..ae4ea21 100644
--- a/modules/boot.nix
+++ b/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
-      '';
     };
   };
 }
diff --git a/modules/theming.nix b/modules/theming.nix
index 095fac3..4d26bc8 100644
--- a/modules/theming.nix
+++ b/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 = [