diff --git a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix
index 3808189..52761dd 100755
--- a/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix
+++ b/homes/aarch64-darwin/evanreichard@mac-va-mbp-personal/default.nix
@@ -30,5 +30,9 @@ in
         opencode = enabled;
       };
     };
+
+    security = {
+      sops = enabled;
+    };
   };
 }
diff --git a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
index 4dbcaad..fc2f7bd 100755
--- a/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
+++ b/homes/aarch64-linux/evanreichard@lin-va-mbp-personal/default.nix
@@ -21,6 +21,9 @@ in
       ssh-agent = enabled;
       fusuma = enabled;
       swww = enabled;
+    };
+
+    security = {
       sops = enabled;
     };
 
diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
index 3fe1bc6..1b117b8 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix
@@ -22,6 +22,9 @@ in
       fusuma = enabled;
       swww = enabled;
       poweralertd = enabled;
+    };
+
+    security = {
       sops = enabled;
     };
 
diff --git a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
index 8417733..76a3ca8 100755
--- a/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
+++ b/homes/x86_64-linux/evanreichard@lin-va-utility/default.nix
@@ -21,6 +21,9 @@ in
       ssh-agent = enabled;
       fusuma = enabled;
       swww = enabled;
+    };
+
+    security = {
       sops = enabled;
     };
 
diff --git a/modules/home/programs/terminal/git/default.nix b/modules/home/programs/terminal/git/default.nix
index cebc7d8..dfbd864 100755
--- a/modules/home/programs/terminal/git/default.nix
+++ b/modules/home/programs/terminal/git/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, config, namespace, ... }:
+{ pkgs
+, lib
+, config
+, namespace
+, ...
+}:
 let
   inherit (lib) mkIf;
   cfg = config.${namespace}.programs.terminal.git;
@@ -82,10 +87,7 @@ in
       };
     };
 
-    home.packages = with pkgs; [
-      gh
-      pre-commit
-    ];
+    home.packages = with pkgs; [ gh ];
 
     # Copy Configuration
     xdg.configFile = {
diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix
index ccfc911..e90a1a5 100755
--- a/modules/home/programs/terminal/nvim/default.nix
+++ b/modules/home/programs/terminal/nvim/default.nix
@@ -1,9 +1,8 @@
-{
-  pkgs,
-  lib,
-  config,
-  namespace,
-  ...
+{ pkgs
+, lib
+, config
+, namespace
+, ...
 }:
 let
   inherit (lib) mkIf;
@@ -149,7 +148,6 @@ in
         luaformatter
         nixpkgs-fmt
         nodePackages.prettier
-        sqlfluff
         stylua
 
         # Tools
diff --git a/modules/home/services/sops/default.nix b/modules/home/security/sops/default.nix
similarity index 88%
rename from modules/home/services/sops/default.nix
rename to modules/home/security/sops/default.nix
index 6eb6db3..9899f60 100644
--- a/modules/home/services/sops/default.nix
+++ b/modules/home/security/sops/default.nix
@@ -9,10 +9,10 @@ let
   inherit (lib.${namespace}) mkOpt;
   getFile = lib.snowfall.fs.get-file;
 
-  cfg = config.${namespace}.services.sops;
+  cfg = config.${namespace}.security.sops;
 in
 {
-  options.${namespace}.services.sops = with types; {
+  options.${namespace}.security.sops = with types; {
     enable = mkEnableOption "Enable sops";
     defaultSopsFile = mkOpt str "secrets/common/evanreichard.yaml" "Default sops file.";
     sshKeyPaths = mkOpt (listOf path) [ ] "Additional SSH key paths to use.";
diff --git a/systems/aarch64-darwin/mac-va-mbp-personal/default.nix b/systems/aarch64-darwin/mac-va-mbp-personal/default.nix
index e74c043..9370fdc 100644
--- a/systems/aarch64-darwin/mac-va-mbp-personal/default.nix
+++ b/systems/aarch64-darwin/mac-va-mbp-personal/default.nix
@@ -1,7 +1,3 @@
-{ lib, namespace, ... }:
-let
-  inherit (lib.${namespace}) enabled;
-in
 {
   system.stateVersion = 6;
   nix.enable = false;
@@ -12,9 +8,5 @@ in
       enable = true;
       usingDeterminate = true;
     };
-
-    security = {
-      sops = enabled;
-    };
   };
 }