diff --git a/user/fish/default.nix b/user/fish/default.nix
index 8bc07cb..ca88feb 100644
--- a/user/fish/default.nix
+++ b/user/fish/default.nix
@@ -22,13 +22,6 @@ in {
         set_color normal
 
         bind \cy 'commandline | wl-copy -n'
-
-        function systemctl --wraps systemctl
-            env SYSTEMD_COLORS=1 systemctl $argv | kak-pager
-        end
-        function journalctl --wraps journalctl
-            env SYSTEMD_COLORS=1 journalctl $argv | kak-pager
-        end
       '';
       shellAliases = {
         rm = "trash";
diff --git a/user/man.nix b/user/man.nix
index d386e6a..25c5ad0 100644
--- a/user/man.nix
+++ b/user/man.nix
@@ -9,6 +9,8 @@ in {
     home.sessionVariables = {
       PAGER = "${pkgs.kak-pager}/bin/kak-pager";
       MANPAGER = "${pkgs.kak-man-pager}/bin/kak-man-pager";
+      SYSTEMD_PAGER = "${pkgs.kak-pager}/bin/kak-pager";
+      SYSTEMD_PAGERSECURE = "1";
     };
   };
 }