Moved DE config to the generic folder

modules/nix-config/de.nix

@@ -0,0 +1,19 @@
+{ pkgs, lib, currentSystemDe, ... }:
+{
+	services.xserver.enable = true;
+
+	# Display managers
+	services.displayManager.sddm = lib.mkIf (currentSystemDe == "plasma") {
+		enable = true;
+		wayland.enable = true; 
+	};
+	services.xserver.displayManager.gdm.enable = lib.mkIf (currentSystemDe == "gnome") true;
+
+	# Desktop environments
+	services.desktopManager.plasma6.enable = lib.mkIf (currentSystemDe == "plasma") true;
+	environment.plasma6.excludePackages = with pkgs.kdePackages; [
+		elisa
+		konsole
+	];
+	services.xserver.desktopManager.gnome.enable = lib.mkIf (currentSystemDe == "gnome") true;
+}

modules/nix-config/default.nix

@@ -2,6 +2,9 @@
 {
 	imports = [
 		./fonts.nix
+		./de.nix
+		./sound.nix
+		./keyboard.nix
 	];
 
 	time.timeZone = "Europe/Rome";
@@ -31,7 +34,7 @@
 	users.users.${currentSystemUser} = {
 		isNormalUser = true;
 		description = "Patrick Canal";
-		extraGroups = [ "networkmanager" "wheel" "docker" ];
+		extraGroups = [ "networkmanager" "wheel" ];
 		shell = pkgs.fish;
 	};
 

modules/nix-config/keyboard.nix

@@ -0,0 +1,8 @@
+{ ... }: 
+{
+	# Configure keymap in X11
+	services.xserver.xkb = {
+		layout = "us";
+		variant = "";
+	};
+}

modules/nix-config/sound.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+	# Enable sound with pipewire.
+	services.pulseaudio.enable = false;
+	security.rtkit.enable = true;
+
+	services.pipewire = {
+		enable = true;
+		alsa.enable = true;
+		alsa.support32Bit = true;
+		pulse.enable = true;
+	};
+}

modules/packages.nix

@@ -42,14 +42,16 @@
 		# GUI applications
 		baobab
 		brave
+		floorp
+		gnome-boxes
 		kitty
 		mpv
 		nextcloud-client
 		telegram-desktop
 	] ++ (if gamingSystem then [
-		libresprite
 		dolphin-emu
 		heroic 
+		libresprite
 		mangohud
 		prismlauncher
 		steam