diff --git a/hosts/common/modules.nix b/hosts/common/modules.nix index 81d5eec..a469180 100644 --- a/hosts/common/modules.nix +++ b/hosts/common/modules.nix @@ -11,5 +11,6 @@ in modules.common.ssh modules.nixos.bootloader modules.common.environment + modules.nixos.desktop.lightDM ]; } diff --git a/modules/default.nix b/modules/default.nix index 64cdbfc..8d131ad 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,5 @@ { common = { - home = ../hosts/common/home.nix; - module = ../hosts/common/modules.nix; ai = ./common/ai.nix; direnv = ./common/direnv.nix; environment = ./common/environment.nix; @@ -15,27 +13,31 @@ hm = { hyprland = ./home-manager/Hyprland/hyprland.nix; scripts = ./home-manager/Hyprland/scripts.nix; + nvim = ./home-manager/nvim.nix; shell = ./home-manager/shell.nix; spicetify = ./home-manager/spicetify.nix; zed = ./home-manager/zed.nix; zen = ./home-manager/zen.nix; - nvim = ./home-manager/nvim.nix; }; nixos = { + desktop = { + lightDM = ./nixos/desktop/lightDM.nix; + xfce = ./nixos/desktop/xfce.nix; + }; gaming = { - nvidia = ./nixos/gaming/nvidia.nix; amd = ./nixos/gaming/amd.nix; + nvidia = ./nixos/gaming/nvidia.nix; starCitizen = ./nixos/gaming/starCitizen.nix; steam = ./nixos/gaming/steam.nix; vr = ./nixos/gaming/vr.nix; }; + bootloader = ./nixos/bootloader.nix; locale = ./nixos/locale.nix; secrets = ./nixos/secrets.nix; swap = ./nixos/swap.nix; wireless = ./nixos/wireless.nix; - xfce = ./nixos/xfce.nix; }; macos = { diff --git a/modules/nixos/desktop/lightDM.nix b/modules/nixos/desktop/lightDM.nix new file mode 100644 index 0000000..c65e871 --- /dev/null +++ b/modules/nixos/desktop/lightDM.nix @@ -0,0 +1,17 @@ +{ pkgs, ...}: + +{ + services.xserver.displayManager = { + defaultSession = "hyprland"; + lightdm = { + enable = true; + greeters = { + slick = { + enable = true; + }; + }; + + }; + }; + # EOF +} diff --git a/modules/nixos/xfce.nix b/modules/nixos/desktop/xfce.nix similarity index 100% rename from modules/nixos/xfce.nix rename to modules/nixos/desktop/xfce.nix