3 files changed, 4 insertions, 8 deletions
diff --git a/users/seth/programs/gpg.nix b/users/seth/programs/gpg.nix
index 3fba0d3..ff94e36 100644
--- a/users/seth/programs/gpg.nix
+++ b/users/seth/programs/gpg.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   osConfig,
@@ -10,10 +9,6 @@
   services.gpg-agent = lib.mkIf pkgs.stdenv.isLinux {
     enable = true;
 
-    enableBashIntegration = config.programs.bash.enable;
-    enableFishIntegration = config.programs.fish.enable;
-    enableZshIntegration = config.programs.zsh.enable;
-
     pinentryFlavor =
       if osConfig ? programs
       then osConfig.programs.gnupg.agent.pinentryFlavor or "curses"
diff --git a/users/seth/programs/starship/default.nix b/users/seth/programs/starship/default.nix
index 099761b..a1b9104 100644
--- a/users/seth/programs/starship/default.nix
+++ b/users/seth/programs/starship/default.nix
@@ -1,8 +1,10 @@
 {
   programs.starship = {
     enable = true;
+
     enableBashIntegration = false;
     enableZshIntegration = false;
+
     settings =
       {
         format = "$all";
diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix
index 1a5bec1..49192ce 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -5,10 +5,9 @@
   ];
 
   home = {
-    sessionVariables = {
+    sessionVariables = rec {
       EDITOR = "nvim";
-      VISUAL = "$EDITOR";
-      GPG_TTY = "$(tty)";
+      VISUAL = EDITOR;
       CARGO_HOME = "${config.xdg.dataHome}/cargo";
       LESSHISTFILE = "${config.xdg.stateHome}/less/history";
     };