diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix
index 982716c..28574a6 100644
--- a/home-manager/modules/colors.nix
+++ b/home-manager/modules/colors.nix
@@ -269,7 +269,7 @@ in {
         xdg.configFile."Element/theme.json".text = builtins.toJSON elementTheme;
 
         # Mako
-        programs.mako = {
+        services.mako = {
           backgroundColor = "#${cfg.base16.base00}";
           textColor = "#${cfg.base16.base07}";
           borderColor = "#${cfg.base16.base08}";
diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 9547f5c..86f0bff 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -491,7 +491,7 @@ in {
       '';
     };
 
-    programs.mako = {
+    services.mako = {
       enable = lib.mkDefault true;
       maxVisible = lib.mkDefault 6;
       extraConfig = lib.generators.toKeyValue {} {
diff --git a/home-manager/modules/fonts.nix b/home-manager/modules/fonts.nix
index 2f1c10e..75aa925 100644
--- a/home-manager/modules/fonts.nix
+++ b/home-manager/modules/fonts.nix
@@ -62,7 +62,7 @@ in {
 
       programs.rofi.font = "${cfg.font.name} ${toString cfg.font.size}";
 
-      programs.mako.font = "${cfg.font.name} ${toString cfg.font.size}";
+      services.mako.font = "${cfg.font.name} ${toString cfg.font.size}";
 
       wayland.windowManager.sway.config.fonts = {
         names = [cfg.font.name];
diff --git a/modules/nix-ssh-agent.nix b/modules/nix-ssh-agent.nix
index c6a8243..7f6225b 100644
--- a/modules/nix-ssh-agent.nix
+++ b/modules/nix-ssh-agent.nix
@@ -15,15 +15,16 @@ in {
   };
 
   config = lib.mkIf (cfg.sock != null) {
-    systemd.services.ssh-agent-nix-proxy = {
-      wantedBy = [ "nix-daemon.service" ];
-      partOf = [ "nix-daemon.service" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.socat}/bin/socat UNIX-LISTEN:/run/nix-ssh-agent,mode=770,group=nixbld,user=root,reuseaddr,fork UNIX-CONNECT:${cfg.sock}";
-        Restart = "always";
-      };
-    };
+    # systemd.services.ssh-agent-nix-proxy = {
+    #   wantedBy = [ "nix-daemon.service" ];
+    #   partOf = [ "nix-daemon.service" ];
+    #   serviceConfig = {
+    #     ExecStart = "${pkgs.socat}/bin/socat UNIX-LISTEN:/run/nix-ssh-agent,mode=770,group=nixbld,user=root,reuseaddr,fork UNIX-CONNECT:${cfg.sock}";
+    #     Restart = "always";
+    #   };
+    # };
 
-    systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/nix-ssh-agent";
+    # systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/nix-ssh-agent";
+    systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = cfg.sock;
   };
 }