this better work
This commit is contained in:
parent
f879bb41df
commit
4b7903845a
1 changed files with 11 additions and 16 deletions
|
|
@ -7,8 +7,16 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
tuigreet = lib.getExe pkgs.tuigreet;
|
tuigreet = lib.getExe pkgs.tuigreet;
|
||||||
loginShell = pkgs.writeShellScript "login-shell" ''
|
hyprSession = pkgs.writeShellScript "hypr-session" ''
|
||||||
exec $(getent passwd $(id -un) | cut -d: -f7) -l
|
for _hm in "/etc/profiles/per-user/$(id -un)" "$HOME/.nix-profile"; do
|
||||||
|
[ -f "$_hm/etc/profile.d/hm-session-vars.sh" ] && . "$_hm/etc/profile.d/hm-session-vars.sh" && break
|
||||||
|
done
|
||||||
|
unset _hm
|
||||||
|
_tf="''${XDG_STATE_HOME:-$HOME/.local/state}/theme"
|
||||||
|
THEME="$(cat "$_tf" 2>/dev/null)" || THEME="midnight"
|
||||||
|
export THEME
|
||||||
|
unset _tf
|
||||||
|
exec Hyprland
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
@ -90,19 +98,6 @@ in
|
||||||
g = "git";
|
g = "git";
|
||||||
nv = "nvim";
|
nv = "nvim";
|
||||||
};
|
};
|
||||||
loginShellInit = ''
|
|
||||||
for _hm in "/etc/profiles/per-user/$(id -un)" "$HOME/.nix-profile"; do
|
|
||||||
[ -f "$_hm/etc/profile.d/hm-session-vars.sh" ] && . "$_hm/etc/profile.d/hm-session-vars.sh" && break
|
|
||||||
done
|
|
||||||
unset _hm
|
|
||||||
_tf="''${XDG_STATE_HOME:-$HOME/.local/state}/theme"
|
|
||||||
THEME="$(cat "$_tf" 2>/dev/null)" || THEME="midnight"
|
|
||||||
export THEME
|
|
||||||
unset _tf
|
|
||||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
|
||||||
exec Hyprland
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -137,7 +132,7 @@ in
|
||||||
services.greetd = {
|
services.greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.default_session = {
|
settings.default_session = {
|
||||||
command = "${tuigreet} --time --asterisks --cmd ${loginShell}";
|
command = "${tuigreet} --time --asterisks --cmd ${hyprSession}";
|
||||||
user = "greeter";
|
user = "greeter";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue