diff --git a/home-manager/common/software/cli/atuin.nix b/home-manager/common/software/cli/atuin.nix
index 26d2f839..3819e4a6 100644
--- a/home-manager/common/software/cli/atuin.nix
+++ b/home-manager/common/software/cli/atuin.nix
@@ -20,5 +20,6 @@
 
   sops.secrets.atuin_key = {
     sopsFile = ../../../../secrets/secrets.yaml;
+    restartUnits = [ "sops-nix.service" ];
   };
 } 
diff --git a/home-manager/common/software/cli/zellij.nix b/home-manager/common/software/cli/zellij.nix
index 56486492..e5b44d31 100644
--- a/home-manager/common/software/cli/zellij.nix
+++ b/home-manager/common/software/cli/zellij.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, pkgs, inputs, system, ... }: {
   programs.zellij = {
     enable = true;
     # enableBashIntegration = true;
@@ -29,7 +29,43 @@
   xdg.configFile."zjstatus-layout-default" = {
     enable = true;
     target = "zellij/layouts/default.kdl";
-    text   = builtins.readFile ./zellij/layouts/default.kdl;
+    text = ''
+      layout {
+          default_tab_template {
+              children
+              pane size=1 borderless=false {
+                  plugin location="${inputs.zjstatus.packages.${system}.default}" {
+                      format_left   "{mode} #[fg=#89B4FA,bold]{session}"
+                      format_center "{tabs}"
+                      format_right  "{command_git_branch} {datetime}"
+                      format_space  ""
+
+                      border_enabled  "false"
+                      border_char     "─"
+                      border_format   "#[fg=#6C7086]{char}"
+                      border_position "top"
+
+                      hide_frame_for_single_pane "true"
+
+                      mode_normal  "#[bg=blue] "
+                      mode_tmux    "#[bg=#ffc387] "
+
+                      tab_normal   "#[fg=#6C7086] {name} "
+                      tab_active   "#[fg=#9399B2,bold,italic] {name} "
+
+                      command_git_branch_command     "git rev-parse --abbrev-ref HEAD"
+                      command_git_branch_format      "#[fg=blue] {stdout} "
+                      command_git_branch_interval    "10"
+                      command_git_branch_rendermode  "static"
+
+                      datetime        "#[fg=#6C7086,bold] {format} "
+                      datetime_format "%A, %d %b %Y %H:%M"
+                      datetime_timezone "Europe/Berlin"
+                  }
+              }
+          }
+      }
+    '';
   };
 
 }
diff --git a/home-manager/common/software/cli/zellij/layouts/default.kdl b/home-manager/common/software/cli/zellij/layouts/default.kdl
deleted file mode 100644
index 732e7dad..00000000
--- a/home-manager/common/software/cli/zellij/layouts/default.kdl
+++ /dev/null
@@ -1,35 +0,0 @@
-layout {
-    default_tab_template {
-        children
-        pane size=1 borderless=true {
-            plugin location="https://github.com/dj95/zjstatus/releases/latest/download/zjstatus.wasm" {
-                format_left   "{mode} #[fg=#89B4FA,bold]{session}"
-                format_center "{tabs}"
-                format_right  "{command_git_branch} {datetime}"
-                format_space  ""
-
-                border_enabled  "false"
-                border_char     "─"
-                border_format   "#[fg=#6C7086]{char}"
-                border_position "top"
-
-                hide_frame_for_single_pane "true"
-
-                mode_normal  "#[bg=blue] "
-                mode_tmux    "#[bg=#ffc387] "
-
-                tab_normal   "#[fg=#6C7086] {name} "
-                tab_active   "#[fg=#9399B2,bold,italic] {name} "
-
-                command_git_branch_command     "git rev-parse --abbrev-ref HEAD"
-                command_git_branch_format      "#[fg=blue] {stdout} "
-                command_git_branch_interval    "10"
-                command_git_branch_rendermode  "static"
-
-                datetime        "#[fg=#6C7086,bold] {format} "
-                datetime_format "%A, %d %b %Y %H:%M"
-                datetime_timezone "Europe/Berlin"
-            }
-        }
-    }
-}