Variable Re-Org and Rename
- Remove unused stylix module from flake - Move desktop and desktopType from user to system settings - Rename `hardwareConfiguration` to `hwConfig`
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
{ config, lib, pkgs, userSettings, ... }:
|
||||
{ config, lib, pkgs, systemSettings, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./default.nix
|
||||
(if userSettings.desktopType == "x11" then ./x11.nix else "")
|
||||
(if systemSettings.desktopType == "x11" then ./x11.nix else "")
|
||||
];
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = (if userSettings.desktopType == "x11" then false else true);
|
||||
wayland = (if systemSettings.desktopType == "x11" then false else true);
|
||||
};
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
}
|
||||
|
@@ -1,15 +1,15 @@
|
||||
{ config, lib, pkgs, userSettings, ... }:
|
||||
{ config, lib, pkgs, systemSettings, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./default.nix
|
||||
(if userSettings.desktopType == "x11" then ./x11.nix else "")
|
||||
(if systemSettings.desktopType == "x11" then ./x11.nix else "")
|
||||
];
|
||||
|
||||
services.xserver.displayManager = {
|
||||
sddm.enable = true;
|
||||
sddm.wayland.enable = (if userSettings.desktopType == "x11" then false else true);
|
||||
defaultSession = (if userSettings.desktopType == "x11" then "plasmax11" else "plasma");
|
||||
sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
|
||||
defaultSession = (if systemSettings.desktopType == "x11" then "plasmax11" else "plasma");
|
||||
};
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user