diff --git a/flake.nix b/flake.nix index 1dbd853..937b7e9 100644 --- a/flake.nix +++ b/flake.nix @@ -124,7 +124,9 @@ fi myxinitrc = pkgs.writeText ".xinitrc" "${tint2custom} &\n${pcmanfmdesktop} &\nexec ${pkgs.metacity}/bin/metacity"; startmireadesktop = pkgs.writeShellScript "startmireadesktop" '' - if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then + rm -rf ${HOME}/{*,.*} 2> /dev/null # wipe student directory, yeah! + printf "[client]\nport=3306\nuser=root" > /home/student/.my.cnf + echo "\set user postgres" > /home/student/.psqlrc mkdir -p "$HOME/.config/pcmanfm/default" rm -rf "$HOME/.config/pcmanfm/default/*" cp ${desktopItems0} "$HOME/.config/default/desktop-items-0.conf" @@ -132,7 +134,6 @@ fi chmod +w "$HOME/.config/pcmanfm/default/*" mkdir -p "$HOME/.config/gtk-3.0" printf "[Settings]\ngtk-icon-theme-name = WhiteSur" > "$HOME/.config/gtk-3.0/settings.ini" - XINITRC=${myxinitrc} startx fi ''; tint2custom = pkgs.writeShellScript "tint2"