From 70e0c638864f644664ccc33fee4946a9366feaee Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Sat, 20 Jul 2024 20:42:06 +0200
Subject: [PATCH] Added GNOME back into configuration.

---
 home-manager/apps.nix            | 1 +
 machines/luna/configuration.nix  | 5 ++++-
 machines/terra/configuration.nix | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/home-manager/apps.nix b/home-manager/apps.nix
index 7d95227..3bebf99 100644
--- a/home-manager/apps.nix
+++ b/home-manager/apps.nix
@@ -8,6 +8,7 @@
 }: {
   imports = [
     ./plasma.nix
+    ./gnome.nix
   ];
 
   nixpkgs = {
diff --git a/machines/luna/configuration.nix b/machines/luna/configuration.nix
index e84ad63..69b9b70 100644
--- a/machines/luna/configuration.nix
+++ b/machines/luna/configuration.nix
@@ -24,12 +24,15 @@
 
   services.xserver.enable = true;
   services.desktopManager.plasma6.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.displayManager.sddm.autoNumlock = true;
-  services.xserver.displayManager.defaultSession = "plasmax11";
+  services.xserver.displayManager.defaultSession = "plasma";
   boot.loader.systemd-boot.enable = true;  
   boot.kernelModules = [ "snd-seq" "snd-rawmidi" ];
 
+  programs.ssh.askPassword = lib.mkForce "/nix/store/qrzq7dqp8dkffb5dvi42q647dhm87ady-ksshaskpass-6.0.3/bin/ksshaskpass";
+
   hardware.pulseaudio.enable = true;
   networking.networkmanager.enable = true;
 
diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix
index 9b24eaa..b1ff7b9 100644
--- a/machines/terra/configuration.nix
+++ b/machines/terra/configuration.nix
@@ -43,12 +43,15 @@
 
   services.xserver.enable = true;
   services.desktopManager.plasma6.enable = true;
+  srevices.desktopManager.gnome.enable = true;
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.displayManager.sddm.autoNumlock = true;
   services.xserver.displayManager.sddm.wayland.enable = false;
   services.xserver.displayManager.defaultSession = "plasma";
   boot.loader.systemd-boot.enable = true;
 
+  programs.ssh.askPassword = lib.mkForce "/nix/store/qrzq7dqp8dkffb5dvi42q647dhm87ady-ksshaskpass-6.0.3/bin/ksshaskpass";
+
   networking.networkmanager.enable = true;
 
   virtualisation.docker.enable = true;