diff --git a/modules/home/all/_1password.nix b/modules/home/all/_1password.nix
index 5449bdb..695b75b 100644
--- a/modules/home/all/_1password.nix
+++ b/modules/home/all/_1password.nix
@@ -5,7 +5,7 @@
     gh
   ];
 
-  programs.zsh.envExtra = ''
+  programs.zsh.envExtra = lib.mkIf pkgs.stdenv.isDarwin ''
     # For 1Password CLI. This requires `pkgs.gh` to be installed.
     # source $HOME/.config/op/plugins.sh
   '';
@@ -13,10 +13,11 @@
   programs.ssh = {
     enable = true;
     matchBlocks = {
-      # Configure 1Password agent only on macOS; whilst using agent forwarding
-      # to make it available to Linux machines.
-      "*".extraOptions = lib.mkIf pkgs.stdenv.isDarwin {
-        identityAgent = ''"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"'';
+      "*".extraOptions = {
+        identityAgent =
+          if pkgs.stdenv.isDarwin
+          then ''"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"''
+          else ''"~/.1password/agent.sock"'';
       };
     };
   };
@@ -30,7 +31,10 @@
     contents = {
       user.signingKey = flake.config.me.sshKey;
       gpg.format = "ssh";
-      gpg.ssh.program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
+      gpg.ssh.program =
+        if pkgs.stdenv.isDarwin
+        then "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+        else "/run/current-system/sw/bin/op-ssh-sign";
       commit.gpgsign = true;
     };
   }];
diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix
index 690b342..8ad5855 100644
--- a/modules/home/darwin-only.nix
+++ b/modules/home/darwin-only.nix
@@ -2,7 +2,6 @@
   imports = [
     ./all/zsh.nix
     ./all/wezterm
-    ./all/_1password.nix
     # ./all/emacs.nix
   ];
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 19c9621..ff69c4f 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,6 +1,7 @@
 {
   home.stateVersion = "22.11";
   imports = [
+    ./all/_1password.nix
     ./all/tmux.nix
     ./all/neovim
     # ./helix.nix