diff --git a/modules/applications/1password/common.nix b/modules/applications/1password/common.nix
new file mode 100644
index 0000000..34b5aca
--- /dev/null
+++ b/modules/applications/1password/common.nix
@@ -0,0 +1,4 @@
+_: {
+  programs._1password-gui.enable = true;
+  programs._1password.enable = true;
+}
diff --git a/modules/applications/1password/darwin.nix b/modules/applications/1password/darwin.nix
deleted file mode 100644
index a01130a..0000000
--- a/modules/applications/1password/darwin.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  # The macOS app must live in /Applications for its background integrations,
-  # including the SSH agent, to work correctly.
-  homebrew = {
-    enable = true;
-    casks = [ "1password" ];
-  };
-}
diff --git a/modules/applications/1password/nixos.nix b/modules/applications/1password/nixos.nix
index 910279b..e113e6c 100644
--- a/modules/applications/1password/nixos.nix
+++ b/modules/applications/1password/nixos.nix
@@ -1,11 +1,8 @@
 { primaryUser, lib, ... }:
 {
-  programs._1password.enable = true;
-  programs._1password-gui = {
-    enable = true;
-    polkitPolicyOwners = [ primaryUser ];
-  };
+  programs._1password-gui.polkitPolicyOwners = [ primaryUser ];
 
+  # 1Password SSH Agentと競合するagentを無効化
   programs.ssh.startAgent = lib.mkForce false;
   programs.gnupg.agent.enableSSHSupport = lib.mkForce false;
   services.gnome.gcr-ssh-agent.enable = lib.mkForce false;