mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2024-11-05 15:16:23 +01:00
fix displayManager warnings and clean up displayManager configs
This commit is contained in:
parent
d8e2f19ced
commit
2b13d1c0bb
|
@ -20,6 +20,10 @@
|
|||
];
|
||||
jade = {
|
||||
desktop = {
|
||||
dm.autoLogin = {
|
||||
enable = true;
|
||||
delay = 5;
|
||||
};
|
||||
syncthing.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
cloud.enable = true;
|
||||
|
@ -81,10 +85,6 @@
|
|||
};
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||
services.displayManager.autoLogin = {
|
||||
enable = true;
|
||||
user = "jade";
|
||||
};
|
||||
|
||||
# networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
./audio.nix
|
||||
./flatpak.nix
|
||||
./home
|
||||
./dm.nix
|
||||
];
|
||||
services.upower = {
|
||||
enable = true;
|
||||
|
|
36
modules/desktop-environment/dm.nix
Normal file
36
modules/desktop-environment/dm.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.jade.desktop.dm;
|
||||
in
|
||||
with lib; {
|
||||
options.jade.desktop.dm.autoLogin = {
|
||||
enable = mkEnableOption "Enable Autologin";
|
||||
delay = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
};
|
||||
};
|
||||
config.services = {
|
||||
displayManager = {
|
||||
autoLogin = {
|
||||
enable = cfg.autoLogin.enable;
|
||||
user = "jade";
|
||||
};
|
||||
defaultSession = "sway";
|
||||
sessionPackages = [
|
||||
pkgs.sway
|
||||
];
|
||||
};
|
||||
xserver.displayManager.gdm = {
|
||||
enable = true;
|
||||
banner = "Meow :3";
|
||||
autoLogin = {
|
||||
delay = cfg.autoLogin.delay;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -6,14 +6,6 @@
|
|||
xterm.enable = false;
|
||||
};
|
||||
|
||||
displayManager = {
|
||||
gdm.enable = true;
|
||||
sessionPackages = [
|
||||
pkgs.sway
|
||||
];
|
||||
gdm.autoLogin.delay = 5;
|
||||
};
|
||||
|
||||
windowManager.xmonad = {
|
||||
enable = true;
|
||||
};
|
||||
|
@ -21,7 +13,4 @@
|
|||
|
||||
security.polkit.enable = true;
|
||||
programs.sway.enable = true;
|
||||
|
||||
# services.displayManager.defaultSession = "none+xmonad";
|
||||
services.displayManager.defaultSession = "sway";
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue