Switch to using tuigreet with greetd instead of launching directly to sway

This commit is contained in:
Evie Litherland-Smith 2024-06-07 20:44:06 +01:00
parent ae2e3a0d59
commit 508907c589
2 changed files with 18 additions and 14 deletions

View file

@ -1,4 +1,5 @@
{
config,
lib,
pkgs,
...
@ -83,11 +84,15 @@
dbus.packages = with pkgs; [gcr];
greetd = {
enable = true;
settings = let
command = "sway";
in {
initial_session = {inherit command;};
default_session = {inherit command;};
settings = {
default_session.command = ''
${pkgs.greetd.tuigreet}/bin/tuigreet --time\
--remember\
--remember-user-session\
--user-menu\
--asterisks\
--window-padding 10
'';
};
};
pipewire = {

View file

@ -30,7 +30,7 @@
};
defaultModules = {
hostName ? "Atlas",
primaryUser ? "pixelifytica",
userName ? "pixelifytica",
loginShell ? "zsh",
...
}: [
@ -45,7 +45,7 @@
}: {
networking = {inherit hostName;};
nix = {
settings.trusted-users = [primaryUser];
settings.trusted-users = [userName];
registry = {
my-nixos = {
from = {
@ -69,9 +69,8 @@
};
};
};
services.greetd.settings.initial_session.user = primaryUser;
programs.${loginShell}.enable = true;
users.users.${primaryUser} = {
users.users.${userName} = {
shell = pkgs.${loginShell};
group = "users";
isNormalUser = true;
@ -96,7 +95,7 @@
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {
hostName = "Legion";
primaryUser = "pixelifytica";
userName = "pixelifytica";
loginShell = "zsh";
};
};
@ -106,7 +105,7 @@
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {
hostName = "Northstar";
primaryUser = "pixelifytica";
userName = "pixelifytica";
loginShell = "zsh";
};
};
@ -115,7 +114,7 @@
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {
hostName = "Vanguard";
primaryUser = "pixelifytica";
userName = "pixelifytica";
loginShell = "zsh";
};
};
@ -125,7 +124,7 @@
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {
hostName = "Tone";
primaryUser = "elitherl";
userName = "elitherl";
loginShell = "zsh";
};
};
@ -134,7 +133,7 @@
specialArgs = defaultSpecialArgs {inherit system;};
modules = defaultModules {
hostName = "Scorch";
primaryUser = "elitherl";
userName = "elitherl";
loginShell = "zsh";
};
};