diff --git a/nixosModules/desktop/cinnamon/default.nix b/nixosModules/desktop/cinnamon/default.nix index 577a764b..bbe27550 100644 --- a/nixosModules/desktop/cinnamon/default.nix +++ b/nixosModules/desktop/cinnamon/default.nix @@ -5,11 +5,48 @@ ... }: { config = lib.mkIf config.ar.desktop.cinnamon.enable { + security.pam.services.lightdm = { + enableGnomeKeyring = true; + gnupg.enable = true; + kwallet.enable = true; + }; + services = { xserver = { enable = true; - desktopManager.cinnamon = { + desktopManager.cinnamon.enable = true; + + displayManager.lightdm = { enable = true; + greeters.slick = { + enable = true; + + cursorTheme = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + size = 20; + }; + + font = { + name = "NotoSans Nerd Font Regular"; + package = pkgs.nerdfonts; + }; + + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + + theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; + + extraConfig = '' + background=#242424 + enable-hidpi=on + ''; + }; }; }; }; diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index 7b80daa1..1e8824ef 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -9,7 +9,6 @@ ./gnome ./greetd ./hyprland - ./lightdm ./sway ./waylandComp.nix ]; diff --git a/nixosModules/desktop/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix deleted file mode 100644 index d506a0b6..00000000 --- a/nixosModules/desktop/lightdm/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - config = lib.mkIf config.ar.desktop.lightdm.enable { - security.pam.services.lightdm = { - enableGnomeKeyring = true; - gnupg.enable = true; - kwallet.enable = true; - }; - - services.xserver.displayManager.lightdm = { - enable = true; - greeters.slick = { - enable = true; - theme = { - name = "adw-gtk3-dark"; - package = pkgs.adw-gtk3; - }; - - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - - font = { - name = "NotoSans Nerd Font Regular"; - package = pkgs.nerdfonts; - }; - - cursorTheme = { - name = "Bibata-Modern-Classic"; - package = pkgs.bibata-cursors; - size = 20; - }; - - extraConfig = '' - background=#242424 - enable-hidpi=on - ''; - }; - }; - }; -} diff --git a/nixosModules/options.nix b/nixosModules/options.nix index dc9e6f8e..1397d66c 100644 --- a/nixosModules/options.nix +++ b/nixosModules/options.nix @@ -38,7 +38,6 @@ }; hyprland.enable = lib.mkEnableOption "Hyprland wayland session."; - lightdm.enable = lib.mkEnableOption "Lightdm display manager."; steam.enable = lib.mkEnableOption "Steam + Gamescope session."; sway.enable = lib.mkEnableOption "Sway wayland session."; };