From f586de1cb145cf78032fe765040a60f940e6ddab Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 29 Jun 2024 13:12:24 +0200 Subject: [PATCH] chore: move env vars to shared file --- hosts/marr/configuration.nix | 10 ---------- modules/default.nix | 1 + modules/env.nix | 7 +++++++ 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 modules/env.nix diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix index 33f1ec8..4074d41 100644 --- a/hosts/marr/configuration.nix +++ b/hosts/marr/configuration.nix @@ -147,16 +147,6 @@ services.gnome.gnome-keyring.enable = true; services.flatpak.enable = true; - environment.sessionVariables = { - XDG_CACHE_HOME = "$HOME/.cache"; - XDG_CONFIG_HOME = "$HOME/.config"; - XDG_DATA_HOME = "$HOME/.local/share"; - XDG_STATE_HOME = "$HOME/.local/state"; - XDG_CURRENT_DESKTOP = "sway"; - MANROFFOPT = "-c"; - MANPAGER = "sh -c 'col -bx | ${pkgs.bat}/bin/bat -l man -p'"; - }; - environment.variables = { ELECTRON_OZONE_PLATFORM_HINT = "auto"; MOZ_ENABLE_WAYLAND = 1; diff --git a/modules/default.nix b/modules/default.nix index 02c9e1d..46bb5a6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,5 +13,6 @@ ./programs/hyprland.nix ./home-manager.nix ./system/mime.nix + ./env.nix ]; } diff --git a/modules/env.nix b/modules/env.nix new file mode 100644 index 0000000..79d1547 --- /dev/null +++ b/modules/env.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.sessionVariables = { + MANROFFOPT = "-c"; + MANPAGER = "sh -c 'col -bx | ${pkgs.bat}/bin/bat -l man -p'"; + }; +}