From d3dff8cefb4fac62fc350c8946bc0132eb6d1153 Mon Sep 17 00:00:00 2001 From: Daniel V Date: Sat, 9 May 2020 15:39:25 -0400 Subject: [PATCH 1/2] This fixes bash completion for me, though it may not be the best way. Hopefully the pull request will go through or tell me how to do it better --- modules/programs/bash/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/programs/bash/default.nix b/modules/programs/bash/default.nix index 7d13c690..1e60d843 100644 --- a/modules/programs/bash/default.nix +++ b/modules/programs/bash/default.nix @@ -86,6 +86,9 @@ in for m in "$p/etc/bash_completion.d/"*; do source $m done + for m in "$p/share/bash-completion/completions/"*; do + source $m + done done eval "$nullglobStatus" unset nullglobStatus p m From 5796faef94b9b02fbaf64dd3a779a8421c18f20e Mon Sep 17 00:00:00 2001 From: Daniel V Date: Mon, 11 May 2020 06:56:21 -0400 Subject: [PATCH 2/2] Set up XDG system environment variables sort of how they set them up in nixos by appending them to the nix profiles --- modules/environment/default.nix | 5 ++++- modules/programs/bash/default.nix | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/environment/default.nix b/modules/environment/default.nix index d0fb128c..2791c45f 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -169,7 +169,10 @@ in ''; environment.variables = - { EDITOR = mkDefault "nano"; + { + XDG_CONFIG_DIRS = map (path: path + "/etc/xdg") cfg.profiles; + XDG_DATA_DIRS = map (path: path + "/share") cfg.profiles; + EDITOR = mkDefault "nano"; PAGER = mkDefault "less -R"; }; diff --git a/modules/programs/bash/default.nix b/modules/programs/bash/default.nix index 1e60d843..7d13c690 100644 --- a/modules/programs/bash/default.nix +++ b/modules/programs/bash/default.nix @@ -86,9 +86,6 @@ in for m in "$p/etc/bash_completion.d/"*; do source $m done - for m in "$p/share/bash-completion/completions/"*; do - source $m - done done eval "$nullglobStatus" unset nullglobStatus p m