diff --git a/nixos/home/jahanson/global.nix b/nixos/home/jahanson/global.nix
index d023768..e90c9ee 100644
--- a/nixos/home/jahanson/global.nix
+++ b/nixos/home/jahanson/global.nix
@@ -33,7 +33,6 @@ with config;
         p7zip
 
         # cli
-        _1password
         bat
         dbus
         direnv
diff --git a/nixos/home/jahanson/workstation.nix b/nixos/home/jahanson/workstation.nix
index d009070..344b6c6 100644
--- a/nixos/home/jahanson/workstation.nix
+++ b/nixos/home/jahanson/workstation.nix
@@ -5,19 +5,20 @@ with config;
     ./global.nix
   ];
 
-  myHome.programs.firefox.enable = true;
+  myHome = {
+    programs.firefox.enable = true;
+    shell = {
+      starship.enable = true;
+      fish.enable = true;
+      wezterm.enable = true;
+      atuind.enable = true;
 
-  myHome.shell = {
-    starship.enable = true;
-    fish.enable = true;
-    wezterm.enable = true;
-    atuind.enable = true;
-
-    git = {
-      enable = true;
-      username = "Joseph Hanson";
-      email = "joe@veri.dev";
-      signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J";
+      git = {
+        enable = true;
+        username = "Joseph Hanson";
+        email = "joe@veri.dev";
+        signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J";
+      };
     };
   };
 
@@ -26,7 +27,6 @@ with config;
     packages = with pkgs;
       [
         #apps
-        _1password-gui
         discord
         flameshot
         jetbrains.datagrip
diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix
index 337259f..d87cf78 100644
--- a/nixos/hosts/telchar/default.nix
+++ b/nixos/hosts/telchar/default.nix
@@ -46,5 +46,6 @@
   mySystem = {
     purpose = "Development";
     system.motd.networkInterfaces = [ "wlp1s0" ];
+    security._1password.enable = true;
   };
 }
diff --git a/nixos/modules/nixos/security/1password/config/1password-startup.desktop b/nixos/modules/nixos/security/1password/config/1password-startup.desktop
new file mode 100644
index 0000000..0947d95
--- /dev/null
+++ b/nixos/modules/nixos/security/1password/config/1password-startup.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=1Password
+Exec=1password %U --silent
+Terminal=false
+Type=Application
+Icon=1password
+StartupWMClass=1Password
+Comment=Password manager and secure wallet
+MimeType=x-scheme-handler/onepassword;
+Categories=Office;
diff --git a/nixos/modules/nixos/security/1password/default.nix b/nixos/modules/nixos/security/1password/default.nix
new file mode 100644
index 0000000..21b748d
--- /dev/null
+++ b/nixos/modules/nixos/security/1password/default.nix
@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+with lib; let
+  cfg = config.mySystem.security._1password;
+  user = "jahanson";
+in
+{
+  options.mySystem.security._1password = {
+    enable = mkEnableOption "_1password";
+  };
+
+  config = mkIf cfg.enable {
+    programs = {
+      _1password.enable = true;
+      _1password-gui = {
+        enable = true;
+        polkitPolicyOwners = [ "${user}" ];
+      };
+    };
+
+    home-manager.users.${user} = {
+      home.file = {
+        ".config/autostart/1password-startup.desktop".source = ./config/1password-startup.desktop;
+      };
+    };
+
+    environment.etc = {
+      "1password/custom_allowed_browsers" = {
+        text = ''
+          vivaldi-bin
+        '';
+        mode = "0755";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/nixos/security/default.nix b/nixos/modules/nixos/security/default.nix
index 32c8ab0..27d3074 100644
--- a/nixos/modules/nixos/security/default.nix
+++ b/nixos/modules/nixos/security/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./1password
     ./acme
   ];
 }