diff --git a/modules/home/environment/default.nix b/modules/home/environment/default.nix
index 44c5e87..e336436 100755
--- a/modules/home/environment/default.nix
+++ b/modules/home/environment/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ./gtk.nix
     ./spicetify.nix
-    ./stylix.nix
+    ./stylixhome.nix
     ./starship.nix
     ./userpkgs.nix
     ./zshell.nix
diff --git a/modules/home/environment/stylix.nix b/modules/home/environment/stylixhome.nix
similarity index 92%
rename from modules/home/environment/stylix.nix
rename to modules/home/environment/stylixhome.nix
index b4fd4d1..d51f901 100755
--- a/modules/home/environment/stylix.nix
+++ b/modules/home/environment/stylixhome.nix
@@ -19,6 +19,10 @@ in {
       targets = {
         waybar.enable = false;
         btop.enable = false;
+        nixvim.transparentBackground = {
+          main = false;
+          signColumn = false;
+        };
       };
       cursor = {
         package = pkgs.bibata-cursors;
diff --git a/modules/home/environment/userpkgs.nix b/modules/home/environment/userpkgs.nix
index 02cebb7..dfe64f6 100755
--- a/modules/home/environment/userpkgs.nix
+++ b/modules/home/environment/userpkgs.nix
@@ -24,6 +24,8 @@ in {
   config = lib.mkIf config.movOpts.envConfig.userPkgs.enable {
     home.packages = with pkgs; [
       nemo
+      yubikey-manager
+      yubikey-personalization
       gtk3
       sqlite
       gimp
diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix
index a46ef69..eac710d 100755
--- a/modules/home/programs/git.nix
+++ b/modules/home/programs/git.nix
@@ -1,4 +1,4 @@
-{ lib, config, username, ... }: {
+{ lib, config, username, pkgs, ... }: {
   options = {
     movOpts.programConfigs.gitConfig.enable =
       lib.mkEnableOption "enables my git configuration";
@@ -6,7 +6,12 @@
   config = lib.mkIf config.movOpts.programConfigs.gitConfig.enable {
     programs.git = {
       enable = true;
-      userEmail = "${username}@gmail.com";
+      signing = {
+        gpgPath = "${pkgs.gnupg}/bin/gpg";
+        key = "76118C11E525D3D0CBCA0F6EB2A3D477E86843DB";
+        signByDefault = true;
+      };
+      userEmail = "kylerclay@proton.me";
       userName = "${username}";
     };
   };
diff --git a/modules/home/programs/nixvim/keymaps.nix b/modules/home/programs/nixvim/keymaps.nix
index 541e454..d3be2e9 100755
--- a/modules/home/programs/nixvim/keymaps.nix
+++ b/modules/home/programs/nixvim/keymaps.nix
@@ -1,6 +1,21 @@
 {
   programs.nixvim = {
     keymaps = [
+      {
+        action = "<cmd>ChatGPTEditWithInstructions<CR>";
+        key = "!egpt";
+        mode = "n";
+      }
+      {
+        action = "<cmd>ChatGPTCompleteCode<CR>";
+        key = "!cgpt";
+        mode = "n";
+      }
+      {
+        action = "<cmd>ChatGPT<CR>";
+        key = "!gpt";
+        mode = "n";
+      }
       {
         action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
         key = "!ca";
diff --git a/modules/home/programs/nixvim/plugins/chatgpt.nix b/modules/home/programs/nixvim/plugins/chatgpt.nix
new file mode 100644
index 0000000..b7e8d60
--- /dev/null
+++ b/modules/home/programs/nixvim/plugins/chatgpt.nix
@@ -0,0 +1,8 @@
+{
+  programs.nixvim.plugins.chatgpt = {
+    enable = true;
+    settings = {
+      api_key_cmd = "pass keys/openai/apikey";
+    };
+  };
+}
diff --git a/modules/home/programs/nixvim/plugins/default.nix b/modules/home/programs/nixvim/plugins/default.nix
index 2d2335e..ab5ba61 100755
--- a/modules/home/programs/nixvim/plugins/default.nix
+++ b/modules/home/programs/nixvim/plugins/default.nix
@@ -8,6 +8,7 @@
     # ./coq.nix
     ./barbar.nix
     ./cmp.nix
+    ./chatgpt.nix
     ./lsp.nix
     ./fidget.nix
     ./lualine.nix
diff --git a/modules/home/programs/nixvim/plugins/nvim-lightbulb.nix b/modules/home/programs/nixvim/plugins/nvim-lightbulb.nix
index 0ac66d9..e38622b 100644
--- a/modules/home/programs/nixvim/plugins/nvim-lightbulb.nix
+++ b/modules/home/programs/nixvim/plugins/nvim-lightbulb.nix
@@ -4,6 +4,7 @@
     settings = {
       virtual_text = { enable = true; };
       autocmd.enabled = true;
+      sign.enabled = false;
     };
   };
 }
diff --git a/modules/sys/default.nix b/modules/sys/default.nix
index 71d5376..3e3bde3 100755
--- a/modules/sys/default.nix
+++ b/modules/sys/default.nix
@@ -1,3 +1,3 @@
 { inputs, nixpkgs, config, self, username, host, lib, ... }: {
-  imports = [ ./hardware ./software ./environment ];
+  imports = [ ./hardware ./software ./sysenv ];
 }
diff --git a/modules/sys/software/services.nix b/modules/sys/software/services.nix
index 29f79ec..0786726 100755
--- a/modules/sys/software/services.nix
+++ b/modules/sys/software/services.nix
@@ -19,6 +19,7 @@
         alsa.enable = true;
         alsa.support32Bit = true;
       };
+      pcscd.enable = true;
       udev.enable = true;
       dbus.enable = true;
       mullvad-vpn.enable = true;
diff --git a/modules/sys/environment/default.nix b/modules/sys/sysenv/default.nix
similarity index 100%
rename from modules/sys/environment/default.nix
rename to modules/sys/sysenv/default.nix
diff --git a/modules/sys/environment/issue.nix b/modules/sys/sysenv/issue.nix
similarity index 100%
rename from modules/sys/environment/issue.nix
rename to modules/sys/sysenv/issue.nix
diff --git a/modules/sys/environment/nix.nix b/modules/sys/sysenv/nix.nix
similarity index 100%
rename from modules/sys/environment/nix.nix
rename to modules/sys/sysenv/nix.nix
diff --git a/modules/sys/environment/sddm.nix b/modules/sys/sysenv/sddm.nix
similarity index 100%
rename from modules/sys/environment/sddm.nix
rename to modules/sys/sysenv/sddm.nix
diff --git a/modules/sys/environment/stylix.nix b/modules/sys/sysenv/stylix.nix
similarity index 100%
rename from modules/sys/environment/stylix.nix
rename to modules/sys/sysenv/stylix.nix