6 files changed, 26 insertions, 13 deletions
diff --git a/modules/security/enteauth/default.nix b/modules/security/enteauth/default.nix
index a332bf3..376451a 100644
--- a/modules/security/enteauth/default.nix
+++ b/modules/security/enteauth/default.nix
@@ -42,7 +42,7 @@ let
   };
 in
 {
-  options.programs.enteauth = {
+  options.security.enteauth = {
     enable = lib.mkEnableOption "Enables wrapped ente-auth with automated keyring unlocks and a desktop entry.";
     package = lib.mkOption {
       type = lib.types.package;
@@ -51,8 +51,8 @@ in
     };
   };
 
-  config = lib.mkIf config.programs.enteauth.enable {
-    home.packages = [ config.programs.enteauth.package ];
+  config = lib.mkIf config.security.enteauth.enable {
+    home.packages = [ config.security.enteauth.package ];
 
     xdg.mimeApps.defaultApplications = {
       "x-scheme-handler/enteauth" = "enteauth.desktop";
diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix
index 3990f7f..f5a037f 100644
--- a/modules/security/gopass/default.nix
+++ b/modules/security/gopass/default.nix
@@ -7,7 +7,7 @@
 }:
 
 {
-  options.programs.gopass = {
+  options.security.gopass = {
     enable = lib.mkEnableOption "Enables gopass.";
 
     package = lib.mkOption {
@@ -18,10 +18,10 @@
     };
   };
 
-  config = lib.mkIf config.programs.gopass.enable {
+  config = lib.mkIf config.security.gopass.enable {
     programs.password-store = {
       enable = true;
-      package = config.programs.gopass.package;
+      package = config.security.gopass.package;
       settings = {
         PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.local/share/pass";
       };
diff --git a/modules/security/gpg/default.nix b/modules/security/gpg/default.nix
index 858f79f..9ed3868 100644
--- a/modules/security/gpg/default.nix
+++ b/modules/security/gpg/default.nix
@@ -7,13 +7,21 @@
 
 # gpg - GNU Privacy Guard
 {
-  config = lib.mkIf config.programs.gpg.enable {
+  options.security.gpg = {
+    enable = lib.mkEnableOption "Enables gpg.";
+  };
+
+  config = lib.mkIf config.security.gpg.enable {
+    programs.gpg = {
+      enable = true;
+    };
+
     services.gpg-agent = {
       enable = true;
       enableZshIntegration = true;
       defaultCacheTtl = 3600;
       maxCacheTtl = 86400;
-      enableSshSupport = config.programs.ssh.enable;
+      enableSshSupport = config.security.ssh.enable;
       pinentry.package = pkgs.pinentry-gtk2;
     };
   };
diff --git a/modules/security/openvpn/default.nix b/modules/security/openvpn/default.nix
index d0edef3..1636081 100644
--- a/modules/security/openvpn/default.nix
+++ b/modules/security/openvpn/default.nix
@@ -7,12 +7,12 @@
 
 # OpenVPN - Open-source VPN client for secure remote access
 {
-  options.programs.openvpn = {
+  options.security.openvpn = {
     enable = lib.mkEnableOption "Enables openvpn.";
     package = lib.mkPackageOption pkgs "openvpn" { };
   };
 
-  config = lib.mkIf config.programs.openvpn.enable {
-    home.packages = [ config.programs.openvpn.package ];
+  config = lib.mkIf config.security.openvpn.enable {
+    home.packages = [ config.security.openvpn.package ];
   };
 }
diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix
index 7e8752a..2224f98 100644
--- a/modules/security/ssh/default.nix
+++ b/modules/security/ssh/default.nix
@@ -9,8 +9,13 @@
 {
   imports = [ ./git.nix ];
 
-  config = lib.mkIf config.programs.ssh.enable {
+  options.security.ssh = {
+    enable = lib.mkEnableOption "Enables ssh.";
+  };
+
+  config = lib.mkIf config.security.ssh.enable {
     programs.ssh = {
+      enable = true;
       package = pkgs.openssh;
       enableDefaultConfig = false;
       extraOptionOverrides = {
diff --git a/modules/security/ssh/git.nix b/modules/security/ssh/git.nix
index 9683629..2c79d34 100644
--- a/modules/security/ssh/git.nix
+++ b/modules/security/ssh/git.nix
@@ -41,7 +41,7 @@ let
     };
 in
 {
-  config = lib.mkIf (config.programs.ssh.enable && config.programs.git.useSSH) {
+  config = lib.mkIf (config.security.ssh.enable && config.development.git.useSSH) {
     home.file = builtins.listToAttrs (map mkKeyFile hosts);
 
     programs.ssh.settings = builtins.listToAttrs (map mkGitHost hosts);