From 2aa29f48951244638fb27a83fe3cee361c7c33ec Mon Sep 17 00:00:00 2001 From: Zonsopkomst Date: Sun, 12 Feb 2023 09:47:49 -0600 Subject: [PATCH] desktop & display manager edits --- common/{ => Desktop Manager}/gnome.nix | 1 - common/{ => Desktop Manager}/hyperland.nix | 0 common/{ => Desktop Manager}/kde.nix | 1 - common/Display Manager/gdm.nix | 6 +++ common/Display Manager/sddm.nix | 6 +++ flake.nix | 48 ++++++++++++++++------ 6 files changed, 48 insertions(+), 14 deletions(-) rename common/{ => Desktop Manager}/gnome.nix (82%) rename common/{ => Desktop Manager}/hyperland.nix (100%) rename common/{ => Desktop Manager}/kde.nix (70%) create mode 100644 common/Display Manager/gdm.nix create mode 100644 common/Display Manager/sddm.nix diff --git a/common/gnome.nix b/common/Desktop Manager/gnome.nix similarity index 82% rename from common/gnome.nix rename to common/Desktop Manager/gnome.nix index ed6f972..68f7f9f 100644 --- a/common/gnome.nix +++ b/common/Desktop Manager/gnome.nix @@ -2,7 +2,6 @@ { # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; environment.systemPackages = with pkgs;[ diff --git a/common/hyperland.nix b/common/Desktop Manager/hyperland.nix similarity index 100% rename from common/hyperland.nix rename to common/Desktop Manager/hyperland.nix diff --git a/common/kde.nix b/common/Desktop Manager/kde.nix similarity index 70% rename from common/kde.nix rename to common/Desktop Manager/kde.nix index b498972..db7ec46 100644 --- a/common/kde.nix +++ b/common/Desktop Manager/kde.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; } \ No newline at end of file diff --git a/common/Display Manager/gdm.nix b/common/Display Manager/gdm.nix new file mode 100644 index 0000000..d3b8912 --- /dev/null +++ b/common/Display Manager/gdm.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; +} \ No newline at end of file diff --git a/common/Display Manager/sddm.nix b/common/Display Manager/sddm.nix new file mode 100644 index 0000000..183004b --- /dev/null +++ b/common/Display Manager/sddm.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index f9882a9..dbe61f4 100644 --- a/flake.nix +++ b/flake.nix @@ -21,17 +21,23 @@ system = "x86_64-linux"; modules = [ # Common Resources + + # Desktop + ./common/Desktop Manager/gnome.nix + ./common/Display Manager/gdm.nix + #./common/DesktopManager/kde.nix + #./common/Display Manager/sddm.nix + #./common/Desktop Manager/hyperland.nix + + # Modules ./common/amd.nix ./common/CUPS.nix - ./common/gnome.nix - #./common/kde.nix ./common/pipewire.nix ./common/time.nix #./common/docker.nix ./common/flakeinit.nix #./common/flatpak.nix #./common/gaming.nix - #./common/hyperland.nix #./common/insecure.nix ./common/networking.nix ./common/unfree.nix @@ -61,17 +67,23 @@ modules = [ # Common Resources + + # Desktop + #./common/Desktop Manager/gnome.nix + #./common/Display Manager/gdm.nix + ./common/DesktopManager/kde.nix + ./common/Display Manager/sddm.nix + #./common/Desktop Manager/hyperland.nix + + # Modules #./common/amd.nix ./common/CUPS.nix - ./common/gnome.nix - ./common/kde.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix ./common/flakeinit.nix ./common/flatpak.nix ./common/gaming.nix - #./common/hyperland.nix ./common/insecure.nix ./common/networking.nix ./common/unfree.nix @@ -102,17 +114,23 @@ modules = [ # Common Resources + + # Desktop + ./common/Desktop Manager/gnome.nix + ./common/Display Manager/gdm.nix + #./common/DesktopManager/kde.nix + #./common/Display Manager/sddm.nix + #./common/Desktop Manager/hyperland.nix + + # Modules ./common/amd.nix ./common/CUPS.nix - ./common/gnome.nix - #./common/kde.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix ./common/flakeinit.nix ./common/flatpak.nix ./common/gaming.nix - #./common/hyperland.nix ./common/insecure.nix ./common/networking.nix ./common/unfree.nix @@ -142,17 +160,23 @@ modules = [ # Common Resources + + # Desktop + ./common/Desktop Manager/gnome.nix + ./common/Display Manager/gdm.nix + #./common/Desktop Manager/kde.nix + #./common/Display Manager/sddm.nix + #./common/Desktop Manager/hyperland.nix + + # Modules ./common/amd.nix ./common/CUPS.nix - ./common/gnome.nix - #./common/kde.nix ./common/pipewire.nix ./common/time.nix ./common/docker.nix ./common/flakeinit.nix ./common/flatpak.nix ./common/gaming.nix - #./common/hyperland.nix ./common/insecure.nix ./common/networking.nix ./common/unfree.nix