Migration This is my new public git source viewer. Source coming soon. Please contact with concerns/bugs. Contact me

Compare

aeb9107982a669bb3d2f270a6d8e78eb021f6501 … main · 1 commits

merge base aeb9107982a6…

Changed files

FileChanges
users/ryan/common.nix +12 −8 raw

Commits

HashSubjectAuthorDate
3c1f45ed enable xdg since i guess it wasn't Ryan Schanzenbacher
diff --git a/users/ryan/common.nix b/users/ryan/common.nix
index 1e188ea..e2e5890 100644
--- a/users/ryan/common.nix
+++ b/users/ryan/common.nix
@@ -130,13 +130,16 @@
brewPath = if pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64 then ''
eval "$(/opt/homebrew/bin/brew shellenv)"
'' else "";
- in ''
- export GPG_TTY="$(tty)"
- export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
- gpgconf --launch gpg-agent
- gpg-connect-agent updatestartuptty /bye > /dev/null
- ${brewPath}
- '';
+ in lib.mkMerge [
+ (lib.mkOrder 550 "ZVM_INIT_MODE=sourcing")
+ ''
+ export GPG_TTY="$(tty)"
+ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+ gpgconf --launch gpg-agent
+ gpg-connect-agent updatestartuptty /bye > /dev/null
+ ${brewPath}
+ ''
+ ];
shellAliases = {
cat = "bat --paging=never";
diff = "delta";
@@ -199,8 +202,9 @@
recursive = true;
};
+ xdg.enable = true;
+
home.sessionVariables = {
- XDG_CONFIG_HOME = "${config.home.homeDirectory}/.config";
EDITOR = "${pkgs.neovim}/bin/nvim";
};