Clean up gdm config and disable gdm

This commit is contained in:
Julian Mutter 2024-10-05 21:56:06 +02:00
parent 739901d174
commit f05eae5b83
3 changed files with 42 additions and 8 deletions

View File

@ -0,0 +1,39 @@
{
# Snowfall Lib provides a customized `lib` instance with access to your flake's library
# as well as the libraries available from your flake's inputs.
lib,
# An instance of `pkgs` with your overlays and packages applied is also available.
pkgs,
# You also have access to your flake's inputs.
inputs,
# Additional metadata is provided by Snowfall Lib.
namespace, # The namespace used for your flake, defaulting to "internal" if not set.
system, # The system architecture for this host (eg. `x86_64-linux`).
target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
format, # A normalized name for the system target (eg. `iso`).
virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
systems, # An attribute map of your defined hosts.
# All other arguments come from the module system.
config,
...
}:
let
cfg = config.modules.gdm;
in
{
options.modules.gdm = {
enable = lib.mkOption { default = false; };
};
config = lib.mkIf cfg.enable {
services.xserver.displayManager.gdm = {
enable = true;
};
# unlock GPG keyring on login
security.pam.services.gdm.enableGnomeKeyring = true;
};
}

View File

@ -33,5 +33,6 @@ in
# programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
programs.hyprland.xwayland.enable = true;
security.pam.services.hyprlock = { };
services.displayManager.defaultSession = "hyprland";
};
}

View File

@ -104,15 +104,11 @@
hardware.opengl.enable = true;
services.xserver.wacom.enable = true;
# services.xserver.xautolock = { # TODO: does not work
# enable = true;
# time = 1;
# };
# Configure keymap in X11
services.xserver = {
enable = true;
displayManager.gdm.enable = true;
# Configure keymap in X11
xkb.layout = "de";
xkb.variant = "";
};
@ -123,8 +119,6 @@
options = "--delete-older-than 30d";
};
security.pam.services.gdm.enableGnomeKeyring = true;
services.blueman.enable = true;
services.upower.enable = true;