ItsDrike/nixdots
1
0
Fork 0
mirror of https://github.com/ItsDrike/nixdots synced 2024-09-19 21:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: ItsDrike:8a4d6ba1cb7314d8a45a78ba672bd293fd44ecd6
Branches Tags
ItsDrike:main
ItsDrike:fix-wayland
ItsDrike:temp
ItsDrike:polymouth
ItsDrike:boot-opts
...
compare: ItsDrike:4660bc004601c3592f1f3040810bfb8d25760973
Branches Tags
ItsDrike:main
ItsDrike:fix-wayland
ItsDrike:temp
ItsDrike:polymouth
ItsDrike:boot-opts

3 commits
8a4d6ba1cb ... 4660bc0046

Author SHA1 Message Date
ItsDrike 4660bc0046
hyprland: dbus/systemd import some more theme related variables 2024-06-27 15:42:37 +02:00
ItsDrike a39d39ec1e
greetd: Run session command from user's shell 2024-06-27 15:42:00 +02:00
ItsDrike 03d4c5e69a
Fix some issues in greetd config 2024-06-27 14:35:16 +02:00
2 changed files with 21 additions and 8 deletions
Show stats Expand all files Collapse all files

4
home/programs/graphical/wms/hyprland/config/exec.nix
View file

@ -1,8 +1,8 @@
{pkgs, ...}: {
wayland.windowManager.hyprland.settings = {
exec-once = [
"${pkgs.systemd}/bin/systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"${pkgs.systemd}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP"
"${pkgs.systemd}/bin/systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME QT_QPA_PLATFORMTHEME QT_STYLE_OVERRIDE"
"${pkgs.systemd}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME QT_QPA_PLATFORMTHEME QT_STYLE_OVERRIDE"
];
};
}

25
system/roles/workstation/display/login/greetd.nix
View file

@ -15,10 +15,20 @@
tuiGreetTheme = "'border=magenta;text=cyan;prompt=green;time=red;action=white;button=yellow;container=black;input=gray'";
sessionData = config.services.displayManager.sessionData.desktops;
sessionPaths = concatStringsSep ":" [
"${sessionData}/share/xsessions"
"${sessionData}/share/wayland-sessions"
];
# Run the session / application using the appropriate shell configured for this user.
# This will make sure all of the environment variables are set before the WM session
# is started. This is very important, as without it, variables for things like qt theme
# will not be set, and applications executed by the WM will not be themed properly.
sessionWrapperScript = pkgs.writeShellScriptBin "tuigreet-session-wrapper" ''
set -euo pipefail
script_name="$0"
shell="$(getent passwd itsdrike | awk -F: '{print $NF}')"
command=("$@")
exec "$shell" -c 'exec "$@"' "$script_name" "''${command[@]}"
'';
defaultSession = {
user = "greeter";
@ -29,8 +39,11 @@
"--remember-user-session"
"--asterisks"
"--greeting ${greetingMsg}"
"--sessions '${sessionPaths}'"
"--theme ${tuiGreetTheme}"
"--sessions '${sessionData}/share/wayland-sessions'"
"--xsessions '${sessionData}/share/xsessions'"
"--session-wrapper ${sessionWrapperScript}/bin/tuigreet-session-wrapper"
"--xsession-wrapper ${sessionWrapperScript}/bin/tuigreet-session-wrapper startx /usr/bin/env \"$@\""
];
};
in {
@ -52,7 +65,7 @@ in {
# See: https://github.com/apognu/tuigreet/issues/68#issuecomment-1586359960
systemd.services.greetd.serviceConfig = {
Type = "idle";
StandardInputs = "tty";
StandardInput = "tty";
StandardOutput = "tty";
StandardError = "journal";
TTYReset = true;