From b1cc1822e15cd2306ea582f7784faada650fd3a1 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Thu, 15 Jul 2021 20:56:25 +0700
Subject: [PATCH] split home.sessionVariables into module

---
 modules/user/sessionVariables.nix | 27 +++++++++++++++++++++++++++
 users/rin.nix                     | 28 ++--------------------------
 2 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 modules/user/sessionVariables.nix

diff --git a/modules/user/sessionVariables.nix b/modules/user/sessionVariables.nix
new file mode 100644
index 0000000..5dcd43a
--- /dev/null
+++ b/modules/user/sessionVariables.nix
@@ -0,0 +1,27 @@
+{ config, ... }: {
+  home.sessionVariables = {
+    PATH = builtins.concatStringsSep ":" [
+      "${config.home.homeDirectory}/.local/bin"
+      "${config.xdg.dataHome}/npm/bin"
+      "$PATH"
+    ];
+
+    XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
+    EDITOR = "nvim";
+
+    _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
+    CARGO_HOME = "${config.xdg.dataHome}/cargo";
+    DIRENV_LOG_FORMAT = "";
+    GNUPGHOME = "${config.xdg.dataHome}/gnupg";
+    GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+    LESSHISTFILE = "-";
+    NODE_REPL_HISTORY = "${config.xdg.dataHome}/nodejs/repl_history";
+    NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
+    PUB_CACHE = "${config.xdg.cacheHome}/dart";
+    WGETRC = "${config.xdg.configHome}/wgetrc";
+    XINITRC = "${config.xdg.configHome}/xorg/xinitrc";
+
+    WINEPREFIX = "${config.xdg.dataHome}/wine64";
+    WINEARCH = "win64";
+  };
+}
diff --git a/users/rin.nix b/users/rin.nix
index 15fe3c9..e2a990d 100644
--- a/users/rin.nix
+++ b/users/rin.nix
@@ -40,35 +40,11 @@
         xclip
         xorg.xgamma
       ];
-
-      sessionVariables = {
-        PATH = builtins.concatStringsSep ":" [
-          "${config.home.homeDirectory}/.local/bin"
-          "${config.xdg.dataHome}/npm/bin"
-          "$PATH"
-        ];
-
-        XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
-        EDITOR = "nvim";
-
-        _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
-        CARGO_HOME = "${config.xdg.dataHome}/cargo";
-        DIRENV_LOG_FORMAT = "";
-        GNUPGHOME = "${config.xdg.dataHome}/gnupg";
-        GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-        LESSHISTFILE = "-";
-        NODE_REPL_HISTORY = "${config.xdg.dataHome}/nodejs/repl_history";
-        NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
-        PUB_CACHE = "${config.xdg.cacheHome}/dart";
-        WGETRC = "${config.xdg.configHome}/wgetrc";
-        XINITRC = "${config.xdg.configHome}/xorg/xinitrc";
-
-        WINEPREFIX = "${config.xdg.dataHome}/wine64";
-        WINEARCH = "win64";
-      };
     };
 
     imports = with modules.user; [
+      sessionVariables
+
       direnv
       git
       gpg