Skip to content

Commit

Permalink
remove (now unneccesary) environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
nzbr committed Dec 14, 2021
1 parent 4f0018d commit 2410ab8
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,6 @@ in
# Don't allow emergency mode, because we don't have a console.
systemd.enableEmergencyMode = false;


# WSLg support
environment.variables = {
DISPLAY = ":0";
WAYLAND_DISPLAY = "wayland-0";

PULSE_SERVER = "${automountPath}/wslg/PulseServer";
XDG_RUNTIME_DIR = "${automountPath}/wslg/runtime-dir";
WSL_INTEROP = "/run/WSL/1_interop";
};

environment.etc."wsl.conf".text = ''
[automount]
enabled=true
Expand All @@ -67,11 +56,11 @@ in
options=metadata,uid=1000,gid=100
'';

system.activationScripts.copy-launchers.text = ''
for x in applications icons; do
echo "Copying /usr/share/$x"
rm -rf /usr/share/$x
cp -r $systemConfig/sw/share/$x/. /usr/share/$x
done
'';
system.activationScripts = {
copy-launchers = stringAfter [] ''
for x in applications icons; do
echo "Copying /usr/share/$x"
${pkgs.rsync}/bin/rsync -ar --delete $systemConfig/sw/share/$x/. /usr/share/$x
done
'';
}

0 comments on commit 2410ab8

Please sign in to comment.