ugh
This commit is contained in:
parent
d24af7bef5
commit
d0c8e279ca
6 changed files with 226 additions and 54 deletions
|
@ -77,30 +77,98 @@ in
|
|||
};
|
||||
|
||||
services.displayManager.cosmic-greeter = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = rec {
|
||||
initial_session = {
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
user = "chris";
|
||||
};
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'uwsm start hyprland-uwsm.desktop' -s /etc/greetd/environments";
|
||||
user = "greeter";
|
||||
};
|
||||
cosmic_session = {
|
||||
command = "start-cosmic";
|
||||
user = "chris";
|
||||
};
|
||||
hyprland_session = {
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
user = "chris";
|
||||
};
|
||||
};
|
||||
};
|
||||
# services.greetd = {
|
||||
# enable = true;
|
||||
# settings = rec {
|
||||
# initial_session = {
|
||||
# command = "uwsm start hyprland-uwsm.desktop";
|
||||
# user = "chris";
|
||||
# };
|
||||
# default_session = {
|
||||
# command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'uwsm start hyprland-uwsm.desktop' -s /etc/greetd/environments";
|
||||
# user = "greeter";
|
||||
# };
|
||||
# cosmic_session = {
|
||||
# command = "start-cosmic";
|
||||
# user = "chris";
|
||||
# };
|
||||
# hyprland_session = {
|
||||
# command = "uwsm start hyprland-uwsm.desktop";
|
||||
# user = "chris";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
services.displayManager.sessionPackages = [
|
||||
((pkgs.writeTextFile {
|
||||
name = "cosmic-on-niri";
|
||||
destination = "/share/wayland-sessions/COSMIC-on-niri.desktop";
|
||||
text = ''
|
||||
[Desktop Entry]
|
||||
Name=COSMIC-on-niri
|
||||
Comment=This session logs you into the COSMIC desktop on niri
|
||||
Type=Application
|
||||
DesktopNames=niri
|
||||
Exec=${pkgs.writeShellApplication {
|
||||
name = "start-cosmic-ext-niri";
|
||||
runtimeInputs = [ pkgs.systemd pkgs.dbus pkgs.cosmic-session pkgs.bash pkgs.coreutils ];
|
||||
text = ''
|
||||
set -e
|
||||
# From: https://people.debian.org/~mpitt/systemd.conf-2016-graphical-session.pdf
|
||||
if command -v systemctl >/dev/null; then
|
||||
# robustness: if the previous graphical session left some failed units,
|
||||
# reset them so that they don't break this startup
|
||||
for unit in $(systemctl --user --no-legend --state=failed --plain list-units | cut -f1 -d' '); do
|
||||
partof="$(systemctl --user show -p PartOf --value "$unit")"
|
||||
for target in cosmic-session.target graphical-session.target; do
|
||||
if [ "$partof" = "$target" ]; then
|
||||
systemctl --user reset-failed "$unit"
|
||||
break
|
||||
fi
|
||||
done
|
||||
done
|
||||
fi
|
||||
# use the user's preferred shell to acquire environment variables
|
||||
# see: https://github.com/pop-os/cosmic-session/issues/23
|
||||
if [ -n "''${SHELL:-}" ]; then
|
||||
# --in-login-shell: our flag to indicate that we don't need to recurse any further
|
||||
if [ "''${1:-}" != "--in-login-shell" ]; then
|
||||
# `exec -l`: like `login`, prefixes $SHELL with a hyphen to start a login shell
|
||||
exec bash -c "exec -l ${"'"}''${SHELL}' -c ${"'"}''${0} --in-login-shell'"
|
||||
fi
|
||||
fi
|
||||
export XDG_CURRENT_DESKTOP="''${XDG_CURRENT_DESKTOP:=niri}"
|
||||
export XDG_SESSION_TYPE="''${XDG_SESSION_TYPE:=wayland}"
|
||||
export XCURSOR_THEME="''${XCURSOR_THEME:=Cosmic}"
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
export GDK_BACKEND=wayland,x11
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=1
|
||||
export QT_ENABLE_HIGHDPI_SCALING=1
|
||||
if command -v systemctl >/dev/null; then
|
||||
# set environment variables for new units started by user service manager
|
||||
systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
|
||||
fi
|
||||
# Run cosmic-session
|
||||
if [[ -z "''${DBUS_SESSION_BUS_ADDRESS}" ]]; then
|
||||
exec dbus-run-session -- cosmic-session niri
|
||||
else
|
||||
exec cosmic-session niri
|
||||
fi
|
||||
'';
|
||||
}}/bin/start-cosmic-ext-niri
|
||||
'';
|
||||
}
|
||||
|
||||
).overrideAttrs
|
||||
(old: {
|
||||
passthru.providedSessions = [ "COSMIC-on-niri" ];
|
||||
}))
|
||||
];
|
||||
|
||||
programs.regreet = { enable = true; };
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue