colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fix so sway inherits program env vars

Browse Source
This commit is contained in:
Colin
2024-02-02 15:36:06 +00:00
parent d3eaa69261
commit 065d045640
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hosts/modules/gui/unl0kr/default.nix
View File

@@ -107,13 +107,16 @@ in
systemd.defaultUnit = "graphical.target"; systemd.defaultUnit = "graphical.target";
sane.users."${cfg.user}".fs.".profile".symlink.text = lib.optionalString (cfg.afterLogin != null) '' # lib.mkAfter so that launching the DE happens *after* any other .profile setup.
# alternatively, we could recurse: exec a new login shell with some env-var signalling to not launch the DE,
# run with `-c "{cfg.afterLogin}"`
sane.users."${cfg.user}".fs.".profile".symlink.text = lib.mkAfter (lib.optionalString (cfg.afterLogin != null) ''
# if already running a desktop environment, or if running from ssh, then `tty` will show /dev/pts/NN. # if already running a desktop environment, or if running from ssh, then `tty` will show /dev/pts/NN.
if [ "$(tty)" = "/dev/${tty}" ]; then if [ "$(tty)" = "/dev/${tty}" ]; then
echo 'launching default session in ${builtins.toString cfg.delay}s' echo 'launching default session in ${builtins.toString cfg.delay}s'
sleep ${builtins.toString cfg.delay} && exec ${cfg.afterLogin} sleep ${builtins.toString cfg.delay} && exec ${cfg.afterLogin}
fi fi
''; '');
# see: `man login.defs` # see: `man login.defs`
# disable timeout for `login` program. # disable timeout for `login` program.

9
modules/users.nix
View File

@@ -113,6 +113,15 @@ let
; ;
in in
lib.concatStringsSep "\n" env + "\n"; lib.concatStringsSep "\n" env + "\n";
fs.".profile".symlink.text = ''
# source env vars and the like, as systemd would. `man environment.d`
for env in ~/.config/environment.d/*.conf; do
# surround with `set -o allexport` since environment.d doesn't explicitly `export` their vars
set -a
source "$env"
set +a
done
'';
} }
{ {
fs = lib.mkMerge (mapAttrsToList (serviceName: value: fs = lib.mkMerge (mapAttrsToList (serviceName: value: