diff --git a/modules/home/default.nix b/modules/home/default.nix
index 56f34bdc..1199ac20 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,6 +8,7 @@
     (import (sources.arc-nixexprs + "/modules")).home-manager.base16
     (import (sources.arc-nixexprs + "/modules")).home-manager.syncplay
     (import (sources.arc-nixexprs + "/modules")).home-manager.konawall
+    (import (sources.arc-nixexprs + "/modules")).home-manager.i3gopher
     (sources.arc-nixexprs + "/modules/home/weechat.nix")
   ];
 }
diff --git a/profiles/sway/home/konawall.nix b/profiles/sway/home/konawall.nix
index 49434241..4e6a9939 100644
--- a/profiles/sway/home/konawall.nix
+++ b/profiles/sway/home/konawall.nix
@@ -1,5 +1,5 @@
-{ config, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  services.konawall = { enable = true; };
+  services.konawall = { enable = true; interval = "20m"; };
 }
diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix
index 0287ccd4..36114e6b 100644
--- a/profiles/sway/home/sway.nix
+++ b/profiles/sway/home/sway.nix
@@ -17,19 +17,8 @@ in {
 
   home.packages = with pkgs; [ grim slurp wl-clipboard jq ];
 
-  systemd.user.services.i3gopher = {
-    Unit = {
-      Description = "i3 focus history";
-      After = [ "sway-session.target" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "exec";
-      Restart = "on-failure";
-      StandardOutput = "null";
-      ExecStart = "${pkgs.i3gopher}/bin/i3gopher";
-    };
-    Install.WantedBy = [ "sway-session.target" ];
+  services.i3gopher = {
+    enable = true;    
   };
 
   programs.zsh.profileExtra = ''
@@ -152,7 +141,7 @@ in {
 
         "${cfg.modifier}+Tab" = "workspace back_and_forth";
         "${cfg.modifier}+Shift+Tab" =
-          "exec ${pkgs.i3gopher}/bin/i3gopher --focus-last";
+          "exec ${config.services.i3gopher.focus-last}";
         "${cfg.modifier}+Ctrl+Left" = "workspace prev_on_output";
         "${cfg.modifier}+Ctrl+Right" = "workspace next_on_output";