graphical, sway: disable greetd, auto-login directly to desktop

This commit is contained in:
teutat3s 2021-11-29 14:10:21 +01:00
parent 91163d38ed
commit b84d88fc92
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
9 changed files with 15 additions and 15 deletions

View file

@ -15,7 +15,6 @@ in
services.pcscd.enable = true; services.pcscd.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs; systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;

View file

@ -49,15 +49,7 @@ in
}; };
}; };
services.greetd = { services.getty.autologinUser = "${psCfg.user.name}";
enable = true;
restart = false;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.sway-service}/bin/sway-service";
};
};
};
qt5 = { qt5 = {
enable = true; enable = true;

View file

@ -37,7 +37,7 @@ set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutd
bindsym $mod+0 mode "$mode_system" bindsym $mod+0 mode "$mode_system"
mode "$mode_system" { mode "$mode_system" {
bindsym l exec swaylock-bg, mode "default" bindsym l exec swaylock-bg, mode "default"
bindsym e exec systemctl --user stop graphical-session.target, mode "default" bindsym e exec swaymsg exit, mode "default"
bindsym s exec systemctl suspend, mode "default" bindsym s exec systemctl suspend, mode "default"
bindsym h exec systemctl hibernate, mode "default" bindsym h exec systemctl hibernate, mode "default"
bindsym r exec systemctl reboot, mode "default" bindsym r exec systemctl reboot, mode "default"

View file

@ -3,4 +3,6 @@
# systemctl import-environment is complete, and services that require certain variables # systemctl import-environment is complete, and services that require certain variables
# will fail to run. # will fail to run.
# https://github.com/swaywm/sway/wiki/Systemd-integration # https://github.com/swaywm/sway/wiki/Systemd-integration
exec "systemctl --user import-environment; systemctl --user start sway-session.target; dbus-update-activation-environment WAYLAND_DISPLAY" # Also, import the most important environment variables into the D-Bus and systemd
# user environments (e.g. required for screen sharing and Pinentry prompts):
exec "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemctl --user start sway-session.target; exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP; systemd-cat --identifier=sway sway"

View file

@ -62,7 +62,6 @@ in
swaylock-bg swaylock-bg
sway-launcher sway-launcher
sway-service
import-gtk-settings import-gtk-settings
s s
wcwd wcwd
@ -72,7 +71,6 @@ in
#programs.waybar.systemd.enable = true; #programs.waybar.systemd.enable = true;
systemd.user.services.mako = import ./mako.service.nix pkgs; systemd.user.services.mako = import ./mako.service.nix pkgs;
systemd.user.services.sway = import ./sway.service.nix pkgs;
systemd.user.services.swayidle = import ./swayidle.service.nix pkgs; systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs; systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
systemd.user.services.waybar = import ./waybar.service.nix pkgs; systemd.user.services.waybar = import ./waybar.service.nix pkgs;

View file

@ -9,6 +9,7 @@ pkgs:
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
Environment = "PATH=${pkgs.bash}/bin:${pkgs.sway}/bin:${pkgs.swaylock}/bin";
ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \ ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
timeout 600 'swaylock-bg' \ timeout 600 'swaylock-bg' \
timeout 900 'swaymsg "output * dpms off"' \ timeout 900 'swaymsg "output * dpms off"' \

View file

@ -10,6 +10,7 @@ pkgs:
Service = { Service = {
Type = "dbus"; Type = "dbus";
Environment = "PATH=${pkgs.bash}/bin:${pkgs.pavucontrol}/bin";
BusName = "fr.arouillard.waybar"; BusName = "fr.arouillard.waybar";
ExecStart = "${pkgs.waybar}/bin/waybar"; ExecStart = "${pkgs.waybar}/bin/waybar";
}; };

View file

@ -15,7 +15,9 @@ in
# Needed to get zsh completion for system packages (e.g. systemd). # Needed to get zsh completion for system packages (e.g. systemd).
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
services.lorri.enable = true; environment.shells = with pkgs; [
zsh
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
screen screen

View file

@ -18,6 +18,11 @@ in
size = 10000; size = 10000;
}; };
loginExtra = ''
[ "$(tty)" = "/dev/tty1" ] && exec sway
'';
shellAliases = { shellAliases = {
nano = "nvim"; nano = "nvim";
vi = "nvim"; vi = "nvim";