diff --git a/home/ivand/default.nix b/home/ivand/default.nix
index 34a5861..9e3b40e 100644
--- a/home/ivand/default.nix
+++ b/home/ivand/default.nix
@@ -13,12 +13,18 @@
     catppuccin.enable = true;
   };
 
-  home = {
+  home = rec {
     username = "ivand";
     homeDirectory = "/home/ivand";
     sessionPath = [
       "$HOME/.local/bin"
     ];
+    sessionVariables = {
+      PASSWORD_STORE_DIR = "${homeDirectory}/.password-store";
+      EDITOR = "nvim";
+      PAGER = "bat";
+      TERM = "screen-256color";
+    };
     pointerCursor = {
       name = "Catppuccin-Mocha-Green-Cursors";
       package = pkgs.catppuccin-cursors.mochaGreen;
diff --git a/modules/home/programs/nushell/default.nix b/modules/home/programs/nushell/default.nix
index e6c11b7..ba2ff8e 100644
--- a/modules/home/programs/nushell/default.nix
+++ b/modules/home/programs/nushell/default.nix
@@ -12,10 +12,7 @@
           }
         }
       '';
-      PASSWORD_STORE_DIR = "($env.HOME | path join .password-store)";
       PATH = "($env.PATH | split row (char esep) | append ($env.HOME | path join .local bin))";
-      EDITOR = "nvim";
-      TERM = "screen-256color";
     };
     shellAliases = {
       gcal = ''
diff --git a/modules/home/programs/zsh/default.nix b/modules/home/programs/zsh/default.nix
index d6fb1a5..465d9cd 100644
--- a/modules/home/programs/zsh/default.nix
+++ b/modules/home/programs/zsh/default.nix
@@ -7,11 +7,6 @@
     loginExtra = ''
       [ "$(tty)" = "/dev/tty1" ] && exec sway
     '';
-    sessionVariables = {
-      PASSWORD_STORE_DIR = "$HOME/.password-store";
-      PAGER = "bat";
-      TERM = "screen-256color";
-    };
     shellAliases = {
       cal = "cal $(date +%Y)";
       GG = "git add . && git commit -m 'GG' && git push --set-upstream origin HEAD";
@@ -25,6 +20,7 @@
       la = "${pkgs.nushell}/bin/nu -c 'ls -al'";
       torrent = "transmission-remote";
       vi = "nvim";
+      sc = "systemctl";
     };
     shellGlobalAliases = {
       comp = "-vcodec libx265 -crf 28";